affine/jobserv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better client error messages

Browse source
This commit is contained in:
Aidan Hahn 2019-05-19 14:16:09 -07:00
parent f63fe57b98
commit bfd5d40013
No known key found for this signature in database
GPG key ID: 327711E983899316
3 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildwrapper.sh
View file

@ -98,7 +98,7 @@ echo "[+] removing server capabilities from client"
rm staging/client/JobServ/bin/jobserv-server staging/client/JobServ/bin/jobserv-server.bat rm staging/client/JobServ/bin/jobserv-server staging/client/JobServ/bin/jobserv-server.bat
echo "[+] removing client capabilities from server" echo "[+] removing client capabilities from server"
rm staging/client/JobServ/bin/jobserv-client staging/client/JobServ/bin/jobserv-client.bat rm staging/server/JobServ/bin/jobserv-client staging/server/JobServ/bin/jobserv-client.bat
echo "[+] populating certificates" echo "[+] populating certificates"
cp resources/server/server.crt staging/server/ cp resources/server/server.crt staging/server/

10
src/main/java/JobServ/JobServClient.java
View file

@ -94,7 +94,7 @@ public class JobServClient {
// blocking network operation // blocking network operation
response = blockingStub.getOutput(request); response = blockingStub.getOutput(request);
} catch (StatusRuntimeException e) { } catch (StatusRuntimeException e) {
logger.log(Level.WARNING, "(API Failure) Request for output failed: %s", e.getMessage()); logger.log(Level.WARNING, "(API Failure) Request for output failed: " + e.getStatus());
return "<Error connecting to API>"; return "<Error connecting to API>";
} }
@ -119,7 +119,7 @@ public class JobServClient {
// blocking network operation // blocking network operation
response = blockingStub.newJob(request); response = blockingStub.newJob(request);
} catch (StatusRuntimeException e) { } catch (StatusRuntimeException e) {
logger.log(Level.WARNING, "(API Failure) Request for new job failed: %s", e.getMessage()); logger.log(Level.WARNING, "(API Failure) Request for new job failed: " + e.getStatus());
return -1; return -1;
} }
@ -147,7 +147,7 @@ public class JobServClient {
// blocking network operation // blocking network operation
response = blockingStub.getStatus(request); response = blockingStub.getStatus(request);
} catch (StatusRuntimeException e) { } catch (StatusRuntimeException e) {
logger.log(Level.WARNING, "(API Failure) Request for status failed: %s", e.getMessage()); logger.log(Level.WARNING, "(API Failure) Request for status failed: " + e.getStatus());
return false; return false;
} }
@ -172,7 +172,7 @@ public class JobServClient {
// blocking network operation // blocking network operation
response = blockingStub.getReturn(request); response = blockingStub.getReturn(request);
} catch (StatusRuntimeException e) { } catch (StatusRuntimeException e) {
logger.log(Level.WARNING, "(API Failure) Failed to get return code: %s", e.getMessage()); logger.log(Level.WARNING, "(API Failure) Failed to get return code: " + e.getStatus());
return 278; return 278;
} }
@ -196,7 +196,7 @@ public class JobServClient {
// blocking network operation // blocking network operation
response = blockingStub.killJob(request); response = blockingStub.killJob(request);
} catch (StatusRuntimeException e) { } catch (StatusRuntimeException e) {
logger.log(Level.WARNING, "(API Failure) Failed to send request: %s", e.getMessage()); logger.log(Level.WARNING, "(API Failure) Failed to send request: " + e.getStatus());
return; return;
} }

17
src/main/java/JobServ/JobServServer.java
View file

@ -17,6 +17,7 @@ import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.SslProvider; import io.netty.handler.ssl.SslProvider;
import javax.net.ssl.SSLException; import javax.net.ssl.SSLException;
import java.util.InputMismatchException;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -104,17 +105,21 @@ public class JobServServer {
* calls server main loop. * calls server main loop.
*/ */
public static void main(String[] args) throws IOException, InterruptedException { public static void main(String[] args) throws IOException, InterruptedException {
int port = 8448; // TODO: port and key/cert files should be handled by a config manager // TODO: port and key/cert files should be handled by a config manager
if(args.length < 4) {
if(args.length < 3) { System.out.println("Usage: ./jobserv-server port cert privatekey truststore");
System.out.println("Usage: ./jobserv-server cert privatekey truststore");
return; return;
} }
JobServServer server; JobServServer server;
try{ try {
server = new JobServServer(8448, args[0], args[1], args[2]); server = new JobServServer(Integer.parseInt(args[0]), args[1], args[2], args[3]);
} catch (InputMismatchException e) {
System.out.println("Invalid port!");
return;
} catch (SSLException e) { } catch (SSLException e) {
System.out.println(e.getMessage()); System.out.println(e.getMessage());
return; return;