Commit ffd9e64b authored by Chris Hines's avatar Chris Hines
Browse files

deploy new uijson on M3 to report available desktops

parent 9d191183
Pipeline #16491 passed with stages
in 9 minutes and 31 seconds
...@@ -71,6 +71,10 @@ public openWindow$: Subject<any>; ...@@ -71,6 +71,10 @@ public openWindow$: Subject<any>;
private getUserHealthError(error: any, identity: Identity) { private getUserHealthError(error: any, identity: Identity) {
identity.accountalerts.next([]); identity.accountalerts.next([]);
if (identity.expiry < Date.now() || (error.hasOwnProperty("status") && error.status == 401)) {
this.notifications.notify("Your login has expired. Please log in again", () => { this.authorisationService.updateAgentContents().subscribe( () => {return} ) } );
return;
}
console.error(error) console.error(error)
this.notifications.notify("There was an error checking your user account"); this.notifications.notify("There was an error checking your user account");
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps-dev", "appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps-dev",
"cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}", "cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
"statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat", "statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
"userhealth": "/home/chines/strudel2_desktop_user_info.py", "userhealth": "/usr/local/clusterinfo/0.0.6/bin/uijson",
"cacheturis": ["/assets/config/incidents.json"], "cacheturis": ["/assets/config/incidents.json"],
"contact": "<MASSIVE Support> help@massive.org.au" "contact": "<MASSIVE Support> help@massive.org.au"
}, },
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps", "appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps",
"cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}", "cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
"statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat", "statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
"userhealth": "/home/chines/clusterinfo_venv/bin/show_cluster --jsondesktopsummary", "userhealth": "/usr/local/clusterinfo/0.0.6/bin/uijson",
"cacheturis": ["/assets/config/incidents.json"], "cacheturis": ["/assets/config/incidents.json"],
"contact": "<MASSIVE Support> help@massive.org.au" "contact": "<MASSIVE Support> help@massive.org.au"
} }
......
...@@ -10,6 +10,6 @@ ...@@ -10,6 +10,6 @@
"cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}", "cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
"statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat", "statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
"cacheturis": ["/assets/config/incidents.json"], "cacheturis": ["/assets/config/incidents.json"],
"userhealth": "/usr/local/bin/uijson" "userhealth": "/usr/local/clusterinfo/0.0.6/bin/uijson"
} }
] ]
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}", "cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
"statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat", "statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
"cacheturis": ["/assets/config/incidents.json"], "cacheturis": ["/assets/config/incidents.json"],
"userhealth": "/usr/local/bin/uijson" "userhealth": "/usr/local/clusterinfo/0.0.6/bin/uijson"
}, },
{ {
"url": "https://beta-api.cloud.cvl.org.au/cvluwa/", "url": "https://beta-api.cloud.cvl.org.au/cvluwa/",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment