Commit 24f81649 authored by Lance Wilson's avatar Lance Wilson
Browse files

Merge branch 'dev' into 'test'

Dev

See merge request !53
parents a02879d1 610eee99
Pipeline #10351 passed with stages
in 3 minutes and 25 seconds
......@@ -7,6 +7,8 @@ import { Identity } from './identity';
import { Subscription, interval, pipe, Observable } from 'rxjs';
import { BehaviorSubject, timer } from 'rxjs';
import { repeat } from 'rxjs/operators';
import { NotificationsService } from './notifications.service';
@Injectable({
providedIn: 'root'
......@@ -16,7 +18,7 @@ export class JobsService {
private tsub: Subscription;
private id: Identity;
constructor(private tes: TesService, private authService: AuthorisationService) {
constructor(private tes: TesService, private authService: AuthorisationService, private notifications: NotificationsService ) {
this.jobs$ = new BehaviorSubject([]);
}
......@@ -39,6 +41,11 @@ export class JobsService {
}
public getJobsError(error,identity: Identity) {
if (error.hasOwnProperty("error") && error.error.hasOwnProperty("message")) {
this.notifications.notify(error.error.message);
this.tsub.unsubscribe();
return;
}
this.tsub.unsubscribe()
this.authService.updateAgentContents().subscribe((_) => {return});
}
......
[
{
"authorise": "https://sshauthz-dev.cloud.cvl.org.au/pysshauthz/oauth2/oauth/authorize/choose",
"base": "https://sshauthz-dev.cloud.cvl.org.au/pysshauthz/oauth2/",
"authorise": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/oauth/authorize/choose",
"base": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/",
"client_id": "Q96kt2Vtw6S78dpORktM81DH",
"sign": "https://sshauthz-dev.cloud.cvl.org.au/pysshauthz/sign/monash_hpcid/api/v1/sign_key",
"logout": "https://sshauthz-dev.cloud.cvl.org.au/pysshauthz/oauth2/logout",
"sign": "https://sshauthz.cloud.cvl.org.au/pysshauthz/sign/beta_monash/api/v1/sign_key",
"logout": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/logout",
"name": "CVL",
"icon": null,
"scope": "user:email",
......
[
{
"url": "https://strudel2-api-test.cloud.cvl.org.au/m3/",
"url": "https://beta-api.cloud.cvl.org.au/m3/",
"name": "M3",
"host": "m3.massive.org.au",
"dtn": "m3-dtn1.massive.org.au",
"cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
"appCatalog": [],
"appCatalogUri": "./assets/config/m3apps.test.json",
"cancelcmd": "/usr/local/sv2/sv2scancel.sh {jobid}",
"statcmd": "/usr/local/sv2/sv2stat.py",
"appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps",
"cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
"statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
"userhealth": "/usr/local/userhealth/0.0.2/bin/uijson"
}
]
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