Merge pull request #13 from lucamilanesio/master

Stabilise Wetty with regards to child process exits
10 years ago · 7d928db43c
4 changed files with 7 additions and 7 deletions
--- 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;
--- 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": ""
  },
--- 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>
--- 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>