From 9eb18219cb63b951b35e523149fde9ca875ed574 Mon Sep 17 00:00:00 2001 From: Aidan Hahn Date: Thu, 23 May 2019 16:10:43 -0700 Subject: [PATCH] finished refactoring client for additions to protocol --- src/main/java/JobServ/JobServClient.java | 21 +++++++++++++++++-- .../JobServ/JobServClientAPIConnector.java | 3 --- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/java/JobServ/JobServClient.java b/src/main/java/JobServ/JobServClient.java index 53d3ff8..82cc422 100644 --- a/src/main/java/JobServ/JobServClient.java +++ b/src/main/java/JobServ/JobServClient.java @@ -94,8 +94,25 @@ public class JobServClient { } int newProcess = this.api.sendNewJobMessage(command); - // TODO: switch here for negative returns - System.out.printf("Process started, assigned pid is %d\n", newProcess); + switch(newProcess) { + case -1: + System.out.println(this.serversideTimeoutErrorMessage); + break; + + case -2: + System.out.println("Server failed to create job, check server logs."); + break; + + case -3: + // error logged by API Connector + break; + + default: + System.out.printf("Process started, assigned pid is %d\n", newProcess); + break; + } + + return; } /* diff --git a/src/main/java/JobServ/JobServClientAPIConnector.java b/src/main/java/JobServ/JobServClientAPIConnector.java index 834f98d..b8f39c3 100644 --- a/src/main/java/JobServ/JobServClientAPIConnector.java +++ b/src/main/java/JobServ/JobServClientAPIConnector.java @@ -10,7 +10,6 @@ package JobServ; import io.grpc.ManagedChannel; import io.grpc.StatusRuntimeException; -import java.io.File; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; @@ -23,8 +22,6 @@ import java.util.logging.Logger; * and to allow for a veriety of interfaces to be created */ class JobServClientAPIConnector { - private final String serversideTimeoutErrorMessage = "Timeout locking process control on server\n"+ - "Server could be under heavy load\nConsider trying again."; private final String apiFailureMessage = "Failed while trying to connect to server."; /*