couple of typoes

This commit is contained in:
Aidan Hahn 2019-05-23 17:37:45 -07:00
parent 7b0184cbd3
commit c40f8f0a62
No known key found for this signature in database
GPG key ID: 327711E983899316
4 changed files with 5 additions and 4 deletions

View file

@ -112,11 +112,11 @@ echo "[+] Adding wrapper script for client"
cat << EOF > staging/client/client cat << EOF > staging/client/client
./JobServ/bin/jobserv-client private.pem client.crt ca.crt \$@ ./JobServ/bin/jobserv-client private.pem client.crt ca.crt \$@
EOF EOF
chmod +x staging/client/client.sh chmod +x staging/client/client
echo "[+] Adding wrapper script for server" echo "[+] Adding wrapper script for server"
# This could also be a .desktop file without much more work. # This could also be a .desktop file without much more work.
cat << EOF > staging/server/server cat << EOF > staging/server/server
./JobServ/bin/jobserv-server \$1 server.crt private.pem ca.crt ./JobServ/bin/jobserv-server \$1 server.crt private.pem ca.crt
EOF EOF
chmod +x staging/server/server.sh chmod +x staging/server/server

View file

@ -80,7 +80,7 @@ public class JobServClient {
"example: ./client key.pem cert.crt ca.crt localhost 8448 return 0\n\n"+ "example: ./client key.pem cert.crt ca.crt localhost 8448 return 0\n\n"+
"... kill (pid)"+ "... kill (pid)"+
"Immediately destroys remote process"+ "Immediately destroys remote process"+
"example: ./client key.pem cert.crt ca.crt localhost 8448 kill 0\n\n"+ "example: ./client key.pem cert.crt ca.crt localhost 8448 kill 0\n\n");
} }
/* /*

View file

@ -39,6 +39,7 @@ public class JobServServer {
* builds server object * builds server object
*/ */
public JobServServer(SslContext ssl, int port) throws IOException { public JobServServer(SslContext ssl, int port) throws IOException {
this.manager = new ProcessManager();
this.server = NettyServerBuilder.forPort(port) this.server = NettyServerBuilder.forPort(port)
.addService(new ShellServerService(manager)) .addService(new ShellServerService(manager))
.sslContext(ssl) .sslContext(ssl)

View file

@ -22,7 +22,7 @@ class ShellServerService extends ShellServerGrpc.ShellServerImplBase {
* initialized ProcessManager * initialized ProcessManager
*/ */
public ShellServerService(ProcessManager manager) { public ShellServerService(ProcessManager manager) {
this.manager = manager this.manager = manager;
} }
/* /*