mirror of
https://github.com/ClusterCockpit/cc-backend
synced 2025-12-19 05:36:17 +01:00
Fix to NATS deadlock and revert demo script
This commit is contained in:
@@ -263,7 +263,7 @@ func generateJWT(authHandle *auth.Authentication, username string) error {
|
|||||||
return fmt.Errorf("generating JWT for user '%s': %w", user.Username, err)
|
return fmt.Errorf("generating JWT for user '%s': %w", user.Username, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("JWT: Successfully generated JWT for user '%s': %s\n", user.Username, jwt)
|
cclog.Printf("JWT: Successfully generated JWT for user '%s': %s\n", user.Username, jwt)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,11 @@
|
|||||||
"max-age": "2000h"
|
"max-age": "2000h"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nats": {
|
||||||
|
"address": "nats://0.0.0.0:4222",
|
||||||
|
"username": "root",
|
||||||
|
"password": "root"
|
||||||
|
},
|
||||||
"clusters": [
|
"clusters": [
|
||||||
{
|
{
|
||||||
"name": "fritz",
|
"name": "fritz",
|
||||||
@@ -86,6 +91,16 @@
|
|||||||
"interval": "1h",
|
"interval": "1h",
|
||||||
"directory": "./var/archive"
|
"directory": "./var/archive"
|
||||||
},
|
},
|
||||||
"retention-in-memory": "48h"
|
"retention-in-memory": "48h",
|
||||||
|
"subscriptions": [
|
||||||
|
{
|
||||||
|
"subscribe-to": "hpc-nats",
|
||||||
|
"cluster-tag": "fritz"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"subscribe-to": "hpc-nats",
|
||||||
|
"cluster-tag": "alex"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -64,7 +64,6 @@ func ReceiveNats(ms *MemoryStore,
|
|||||||
cclog.Infof("NATS subscription to '%s' established", sc.SubscribeTo)
|
cclog.Infof("NATS subscription to '%s' established", sc.SubscribeTo)
|
||||||
}
|
}
|
||||||
|
|
||||||
<-ctx.Done()
|
|
||||||
close(msgs)
|
close(msgs)
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
|
|
||||||
|
|||||||
20
startDemo.sh
20
startDemo.sh
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
rm -rf var
|
# rm -rf var
|
||||||
|
|
||||||
if [ -d './var' ]; then
|
if [ -d './var' ]; then
|
||||||
echo 'Directory ./var already exists! Skipping initialization.'
|
echo 'Directory ./var already exists! Skipping initialization.'
|
||||||
@@ -14,22 +14,8 @@ else
|
|||||||
cp ./configs/env-template.txt .env
|
cp ./configs/env-template.txt .env
|
||||||
cp ./configs/config-demo.json config.json
|
cp ./configs/config-demo.json config.json
|
||||||
|
|
||||||
echo 3 > /home/adityauj/cc-backend/var/job-archive/version.txt
|
./cc-backend -migrate-db
|
||||||
|
./cc-backend -dev -init-db -add-user demo:admin,api:demo
|
||||||
./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 -server -dev
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user