use a ping url rather than the sshagent to test if a server is available

src/app/backend-selection.service.ts

@@ -83,7 +83,7 @@ export class BackendSelectionService {
     servers = this.apiservers.value;
     for (let server of servers) {
       combineLatest([of(performance.now()),
-      this.http.get<string>(server.tes+'/sshagent',options).pipe(
+      this.http.get<string>(server.tes+'/ping',options).pipe(
         timeout(timeouts))])
       .subscribe((ok) => {server.ping = (performance.now() - <number>(ok[0]))},
                  (err) => {server.ping = null});

src/app/notifications.service.ts

@@ -17,6 +17,10 @@ export class NotificationsService {
   }
 
   notify(msg: any) {
+    if (msg === null || msg === undefined) {
+      this.msg.next("");
+      return
+    }
     if (msg.hasOwnProperty('error')) {
       this.notify(msg.error);
       return;

src/app/settings/settings.component.html

@@ -28,7 +28,7 @@
         <mat-form-field style="width: 100%">
             <mat-label>API Server</mat-label>
             <mat-select [ngModel]="selectedApiServer" (selectionChange)="backendSelectionService.setApiServer($event.value)">
-                <mat-option *ngFor="let apis of backendSelectionService.apiservers|async" [value]="apis" [disabled] ="apis.ping === undefined">
+                <mat-option *ngFor="let apis of backendSelectionService.apiservers|async" [value]="apis" [disabled] ="apis.ping === undefined || apis.ping === null">
                     {{ apis.name }} <span *ngIf="apis.ping !== undefined">(ping: {{ apis.ping }} ms)</span>
                 </mat-option>
             </mat-select>

src/app/tes.service.ts

@@ -359,10 +359,13 @@ private handleError(error: HttpErrorResponse) {
   if (error.error instanceof ErrorEvent) {
     this.notifications.notify("A networking error occured.")
     return
-  } else {
-    this.notifications.notify("Your login appears to have expired. Please login again");
-    this.authorisationService.updateAgentContents().subscribe((v) => {return});
+  } 
+  if (error.hasOwnProperty("status") && error.status == 500) {
+    this.notifications.notify(error);
+    return
   }
+  this.notifications.notify("Your login appears to have expired. Please login again");
+  this.authorisationService.updateAgentContents().subscribe((v) => {return});
 }
 
 

src/assets/config/computesites.json

 [
   {
-    "url": "https://strudel2-api-dev.cloud.cvl.org.au/m3/",
+    "url": "https://beta-api.cloud.cvl.org.au/m3/",
     "name": "M3",
     "host": "m3-login2.massive.org.au",
     "dtn": "m3-dtn1.massive.org.au",
     "cafingerprint": "RSA SHA256:cmDxHrZQSPlBMUUcI/BWmruXho1XOzfXPDHSqVTwV2I",
     "appCatalog": [],
-    "appCatalogCmd": "cat /usr/local/sv2/dev/apps.json",
+    "appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps",
     "cancelcmd": "/usr/local/sv2/dev/scripts/bin/s2cancel {jobid}",
     "statcmd": "/usr/local/sv2/dev/scripts/bin/s2stat",
     "userhealth": "/usr/local/userhealth/0.0.2/bin/uijson",