Merge pull request butlerx#13 from lucamilanesio/master

krishnasrinivas · krishnasrinivas · commit 7d928db43c4e · 2015-03-24T20:09:49.000+05:30
Stabilise Wetty with regards to child process exits
diff --git a/app.js b/app.js
@@ -7,10 +7,6 @@ var pty = require('pty.js');
 var fs = require('fs');
 var waitpid = require('waitpid');
 
-process.on('SIGCHLD', function(args){
-    waitpid(-1);
-});
-
 var opts = require('optimist')
     .options({
         sslkey: {
@@ -129,11 +125,15 @@ wss.on('request', function(request) {
                     rows: 30
                 });
             }
+            console.log((new Date()) + " PID=" + term.pid + " STARTED on behalf of user=" + sshuser)
             term.on('data', function(data) {
                 conn.send(JSON.stringify({
                     data: data
                 }));
             });
+            term.on('exit', function(code) {
+                console.log((new Date()) + " PID=" + term.pid + " ENDED")
+            })
         }
         if (!data)
             return;
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "dependencies": {
     "express": "3.5.1",
     "websocket": "",
-    "pty.js": "",
+    "pty.js": "git+https://github.com/terryschen/pty.js",
     "optimist": "",
     "waitpid": ""
   },
diff --git a/public/index.html b/public/index.html
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="UTF-8">
-    <title>wtf</title>
+    <title>Wetty - The WebTTY Terminal Emulator</title>
     <script src="/wetty/hterm_all.js"></script>
     <script src="/wetty/hterm.js"></script>
     <script src="/wetty/wetty.js"></script>
diff --git a/public/wetty/index.html b/public/wetty/index.html
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="UTF-8">
-    <title>wtf</title>
+    <title>Wetty - The WebTTY Terminal Emulator</title>
     <script src="/wetty/hterm_all.js"></script>
     <script src="/wetty/hterm.js"></script>
     <script src="/wetty/wetty.js"></script>
