diff --git a/src/main/java/JobServ/ProcessController.java b/src/main/java/JobServ/ProcessController.java index 2216b76..71e6ec5 100644 --- a/src/main/java/JobServ/ProcessController.java +++ b/src/main/java/JobServ/ProcessController.java @@ -50,6 +50,8 @@ class ProcessController { this.input = this.process.getInputStream(); this.inputIntermediateStream = new InputStreamReader(this.input); this.reader = new BufferedReader(this.inputIntermediateStream); + + JobServServer.logger.write("Job " + String.valueOf(this.pid) + ": " + command); } /* diff --git a/src/main/java/JobServ/ShellServerService.java b/src/main/java/JobServ/ShellServerService.java index 370557b..4ebc3de 100644 --- a/src/main/java/JobServ/ShellServerService.java +++ b/src/main/java/JobServ/ShellServerService.java @@ -33,6 +33,7 @@ class ShellServerService extends ShellServerGrpc.ShellServerImplBase { public void getStatus(PIDMessage request, StreamObserver responder) { + JobServServer.logger.write("New status request for pid: " + String.valueOf(request.getPid())); int status = manager.getProcessStatus(request.getPid()); StatusMessage reply = StatusMessage.newBuilder() @@ -50,6 +51,7 @@ class ShellServerService extends ShellServerGrpc.ShellServerImplBase { public void getOutput(OutputRequestMessage request, StreamObserver responder) { + JobServServer.logger.write("New Output request for pid: " + String.valueOf(request.getPid())); String output = manager.getProcessOutput(request.getPid(), request.getLines()); @@ -69,6 +71,7 @@ class ShellServerService extends ShellServerGrpc.ShellServerImplBase { StreamObserver responder) { String command = request.getCommand(); + JobServServer.logger.write("New job request: " + command); int newPid = manager.newProcess(command); PIDMessage reply = PIDMessage.newBuilder() @@ -86,6 +89,7 @@ class ShellServerService extends ShellServerGrpc.ShellServerImplBase { public void getReturn(PIDMessage request, StreamObserver responder) { + JobServServer.logger.write("New request for return from job: " + String.valueOf(request.getPid())); int retVal = manager.getProcessReturn(request.getPid()); ReturnMessage reply = ReturnMessage.newBuilder() @@ -103,6 +107,7 @@ class ShellServerService extends ShellServerGrpc.ShellServerImplBase { public void killJob(PIDMessage request, StreamObserver responder) { + JobServServer.logger.write("New Request to kill job: " + String.valueOf(request.getPid())); int status = manager.killProcess(request.getPid()); StatusMessage reply = StatusMessage.newBuilder()