From a709c84499c1c36da9b5a232ed74f96cc3f8e55c Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Wed, 24 Jul 2019 13:33:02 +0800
Subject: [PATCH] deploy user_information to dev service
---
src/app/authorisation.service.ts | 6 ------
src/app/launcher/launcher.component.ts | 6 ++++++
src/assets/config/computesites.dev.json | 4 +++-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/app/authorisation.service.ts b/src/app/authorisation.service.ts
index c05530f..82321ef 100644
--- a/src/app/authorisation.service.ts
+++ b/src/app/authorisation.service.ts
@@ -153,8 +153,6 @@ export class AuthorisationService {
//Verify that the state matched the nonce we used when initiating login
let tuple = JSON.parse(localStorage.getItem('authservice'));
if (tuple == null) {
- console.log('unable to get the authservice from localStorage');
- console.log(localStorage.getItem('authservice'));
return
}
if (tuple[1] != state) {
@@ -170,10 +168,6 @@ export class AuthorisationService {
public getCert() {
var token: AuthToken;
token = this.token.value;
- // if (this.backendSelectionService.apiserver.value === null) {
- // this.backendSelectionService.apiserver.pipe(take(1)).subscribe(() => this.getCert())
- // return
- //}
if (token === null || token === undefined || token.token === undefined || token.token === '' || token.token === null) {
this.token.pipe(skip(1),take(1)).subscribe(() => this.getCert())
return
diff --git a/src/app/launcher/launcher.component.ts b/src/app/launcher/launcher.component.ts
index 81aee18..e692ad6 100644
--- a/src/app/launcher/launcher.component.ts
+++ b/src/app/launcher/launcher.component.ts
@@ -81,11 +81,17 @@ export class LauncherComponent implements OnInit {
if (h.stat == 'error' || h.stat == 'warn') {
count++;
}
+ if(!isNaN(parseInt(h.stat))) {
+ count = count + parseInt(h.stat);
+ }
}
for (h of b) {
if (h.stat == 'error' || h.stat == 'warn') {
count++;
}
+ if(!isNaN(parseInt(h.stat))) {
+ count = count + parseInt(h.stat);
+ }
}
return count;
}
diff --git a/src/assets/config/computesites.dev.json b/src/assets/config/computesites.dev.json
index d49d3e8..7d8823b 100644
--- a/src/assets/config/computesites.dev.json
+++ b/src/assets/config/computesites.dev.json
@@ -9,7 +9,9 @@
"appCatalogUri": "./assets/config/m3apps.dev.json",
"cancelcmd": "/usr/local/sv2/dev/sv2scancel.sh {jobid}",
"statcmd": "/usr/local/sv2/dev/sv2stat.py",
- "userhealth": "/usr/local/sv2/dev/userhealth/bin/jsonuserhealth"
+ "userhealth": "/usr/local/sv2/dev/userhealth/bin/uijson",
+ "cacheturis": ["https://cachet-dev.erc.monash.edu.au/api/v1/incidents"]
+
},
{
"url": "https://strudel2-api-dev.cloud.cvl.org.au/cvluwa/",
--
GitLab