diff --git a/.gitignore b/.gitignore index e03d807..db9f922 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ /var/checkpoints* migrateTimestamps.pl -test_ccms_write_api.sh +test_ccms_write_api* /web/frontend/public/build /web/frontend/node_modules diff --git a/cmd/cc-backend/cli.go b/cmd/cc-backend/cli.go index af32b64..9ee56cb 100644 --- a/cmd/cc-backend/cli.go +++ b/cmd/cc-backend/cli.go @@ -33,6 +33,6 @@ func cliInit() { flag.StringVar(&flagDelUser, "del-user", "", "Remove a existing user. Argument format: ") flag.StringVar(&flagGenJWT, "jwt", "", "Generate and print a JWT for the user specified by its `username`") flag.StringVar(&flagImportJob, "import-job", "", "Import a job. Argument format: `:,...`") - flag.StringVar(&flagLogLevel, "loglevel", "warn", "Sets the logging level: `[debug, info (default), warn, err, crit]`") + flag.StringVar(&flagLogLevel, "loglevel", "warn", "Sets the logging level: `[debug, info , warn (default), err, crit]`") flag.Parse() } diff --git a/cmd/cc-backend/main.go b/cmd/cc-backend/main.go index f9b198d..104182f 100644 --- a/cmd/cc-backend/main.go +++ b/cmd/cc-backend/main.go @@ -263,7 +263,7 @@ func generateJWT(authHandle *auth.Authentication, username string) error { return fmt.Errorf("generating JWT for user '%s': %w", user.Username, err) } - cclog.Infof("JWT: Successfully generated JWT for user '%s': %s", user.Username, jwt) + fmt.Printf("JWT: Successfully generated JWT for user '%s': %s\n", user.Username, jwt) return nil } diff --git a/configs/config.json b/configs/config.json index 5bffc96..88a9e93 100644 --- a/configs/config.json +++ b/configs/config.json @@ -9,8 +9,12 @@ "apiAllowedIPs": ["*"], "short-running-jobs-duration": 300, "resampling": { - "trigger": 30, - "resolutions": [600, 300, 120, 60] + "minimumPoints": 600, + "trigger": 180, + "resolutions": [ + 240, + 60 + ] } }, "cron": { diff --git a/startDemo.sh b/startDemo.sh index b494e81..904caa0 100755 --- a/startDemo.sh +++ b/startDemo.sh @@ -1,19 +1,36 @@ #!/bin/sh -# rm -rf var +rm -rf var if [ -d './var' ]; then echo 'Directory ./var already exists! Skipping initialization.' - ./cc-backend -server -dev -loglevel info + ./cc-backend -server -dev else make - ./cc-backend --init + wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/job-archive-dev.tar + tar xf job-archive-dev.tar + rm ./job-archive-dev.tar + + cp ./configs/env-template.txt .env cp ./configs/config-demo.json config.json - wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/job-archive-demo.tar - tar xf job-archive-demo.tar - rm ./job-archive-demo.tar + echo 3 > /home/adityauj/cc-backend/var/job-archive/version.txt + + ./cc-backend --loglevel info -migrate-db + ./cc-backend --loglevel info -dev -init-db -add-user demo:admin,api:demo + + # Generate JWT and extract only the token value + JWT=$(./cc-backend -jwt demo | grep -oP "(?<=JWT: Successfully generated JWT for user 'demo': ).*") + + # Replace the existing JWT in test_ccms_write_api.sh with the new one + if [ -n "$JWT" ]; then + sed -i "1s|^JWT=.*|JWT=\"$JWT\"|" test_ccms_write_api.sh + echo "✅ Updated JWT in test_ccms_write_api.sh" + else + echo "❌ Failed to generate JWT for demo user" + exit 1 + fi + + ./cc-backend -server -dev - ./cc-backend -dev -init-db -add-user demo:admin,api:demo - ./cc-backend -server -dev -loglevel info fi