node_task 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79735e5f4ab699858eef9104cf225f8e4e1a4f3e
-  data.tar.gz: d7bd36c0567068bcce877b3a9eb684e553d2cefa
+  metadata.gz: 251a401a6d440f9a5fd7399519c12bef82ae32ff
+  data.tar.gz: a159f15a8e6ad3f490b9bfb3fcc3c334170105bd
 SHA512:
-  metadata.gz: 27f366f9e2b2269b46eb86b6065e5cd6872924bc1299d4116b70713a04eb87f439e20025eb648cb63db301a422b9b93b5caffec0b73f1d2885010970ed117f90
-  data.tar.gz: cd225c6b382359ad8b550bde59043affc81f4e566d6978440844c008b0e79c8a99bee4a6411856f452b3bebe98f41f906c525110c2a9f65d72ac52aceda544e9
+  metadata.gz: fc9a7866fd5eaddafbaec94ed2c7b892c8125a65d086705c18a8584069cbaaa9b6d4022dc221b7793dbac9ce44e68d7f4ba8fb6166cd3a86aef28d6aa7ba76d6
+  data.tar.gz: 8d0b4430317f4af05480160b6270ea48815efa43ff5a1d73759ac54c97f4eacd991a02cafc67898e301eae1c4482ae91e6b6a930ded18fa911da08285e5bb677

data/lib/node_task/{index.js → nodeTask.js}

@@ -3,6 +3,9 @@ var path = require('path')
 var net = require('net')
 var ndjson = require('ndjson')
 
+var parentCheckInterval = parseInt(process.env.NODE_TASK_PARENT_CHECK_INTERVAL, 10) || 1000;
+var parentPid = parseInt(process.env.NODE_TASK_DAEMON_ID, 10);
+
 var workingDir = path.resolve(process.env.NODE_TASK_CWD || __dirname)
 var errorLogPath = path.join(workingDir, 'ruby_node_task-error.log')
 var debugLogPath = path.join(workingDir, 'ruby_node_task-debug.log')
@@ -24,6 +27,17 @@ var server = net.createServer(onClientConnect)
 process.on('exit', onExit)
 process.on('uncaughtException', onUncaughtException)
 
+setInterval(function() {
+  try {
+    process.kill(parentPid, 0);
+  } catch (err) {
+    if (err.code === 'ESRCH') {
+      logger.debug('parent '+parentPid+' is no longer alive, exiting')
+      process.exit()
+    }
+  }
+}, parentCheckInterval);
+
 // the important part
 function onClientConnect(socket) {
   logger.debug('client connected')
@@ -44,12 +58,6 @@ function onClientConnect(socket) {
       return sendError(new Error('only one task can be run per connection'))
     }
 
-    if (msg.status) {
-      return server.getConnections(function(err, count) {
-        sendMsg({clients: count-1}) // minus this connection
-      })
-    }
-
     if (!msg.task) {
       return sendError(new Error('msg.task not defined'))
     }

data/lib/node_task/node_task.rb

@@ -9,13 +9,18 @@ class NodeTask
   START_MAX_RETRIES = 1
 
   class Error < StandardError
-    def initialize(js_error)
-      @js_error = js_error
+    attr_accessor :js_error
+
+    def initialize(original_js_error)
+      js_error = original_js_error
+
       super(js_error[:message])
     end
 
     def to_s
-      @js_error[:stack] || @js_error[:message]
+      super unless js_error
+
+      js_error[:stack] || js_error[:message]
     end
   end
 
@@ -64,7 +69,7 @@ class NodeTask
     end
 
     def daemon_start_script
-      File.join(gem_dir, 'index.js').to_s
+      File.join(gem_dir, 'nodeTask.js').to_s
     end
 
     # get configured daemon controller for daemon, and start it
@@ -155,36 +160,30 @@ class NodeTask
       result
     end
 
-    # number of connections active to the daemon
-    def clients_active
-      socket = _make_connection # might fail
-      message = {status: true} # special message type
-      result = request(socket, message)
-      return 0 if result.nil?
-      result[:clients]
+    def alive?
+      current_pid = nil
+      alive = false
+      if @controller
+        begin
+          current_pid = @controller.pid
+        rescue Errno::ENOENT
+        end
+      end
+      if current_pid
+        begin
+          Process.getpgid(current_pid)
+          alive = true
+        rescue Errno::ESRCH
+        end
+      end
+      alive
     end
 
-    # stop the daemon if no one else is using it
+    # stop the daemon
     def release
-      begin
-        # this doesn't really work as intended right now
-        # as no connections are maintained when tasks aren't running
-        return if clients_active > 0
-      rescue Errno::ENOENT => e
-        # socket file probably doesn't exist
-        # maybe we should just return here?
-      end
+      return unless alive?
 
-      pid = nil
-      begin
-        pid = @controller.pid
-      rescue Errno::ENOENT => e
-        # presumably no pid file exists and the daemon is not running
-        logger.debug "daemon already stopped"
-        return
-      end
-
-      logger.debug "stopping daemon #{pid}"
+      logger.debug "stopping daemon #{@controller.pid}"
       @controller.stop
 
       begin
@@ -194,6 +193,21 @@ class NodeTask
       end
     end
 
+    def daemon_env
+      {
+        "NODE_TASK_SOCK_PATH" => socket_path,
+        "NODE_TASK_CWD" => working_dir,
+        "NODE_TASK_DAEMON_ID" => daemon_identifier,
+        "NODE_TASK_PARENT_PID" => Process.pid.to_s,
+        "NODE_TASK_PARENT_CHECK_INTERVAL" => parent_check_interval.to_s,
+        "NODE_ENV" => ENV["RACK_ENV"],
+      }
+    end
+
+    def parent_check_interval
+      1000
+    end
+
     private
 
     def _make_connection
@@ -212,12 +226,11 @@ class NodeTask
     # - some server errors not reported
     def _make_daemon_controller
       logger.debug "socket_path #{socket_path}"
+      logger.debug "starting #{node_command} #{daemon_start_script}"
 
-      puts "starting #{node_command} #{daemon_start_script}"
       controller = DaemonController.new(
         identifier: daemon_identifier,
         start_command: "#{node_command} #{daemon_start_script}",
-        # ping_command: [:unix, socket_path],
         ping_command: Proc.new{
           begin
             _make_connection
@@ -228,19 +241,12 @@ class NodeTask
         },
         pid_file: pid_file,
         log_file: error_log_file,
-        env: {
-          "NODE_TASK_SOCK_PATH" => socket_path,
-          "NODE_TASK_CWD" => working_dir,
-          "NODE_TASK_DAEMON_ID" => daemon_identifier,
-          "NODE_ENV" => ENV["RACK_ENV"],
-        },
+        env: daemon_env,
         log_file_activity_timeout: RESPONSE_TIMEOUT,
         start_timeout: RESPONSE_TIMEOUT,
         daemonize_for_me: true,
       )
 
-      at_exit { release }
-
       controller
     end
   end

data/lib/node_task/package.json

@@ -1,8 +1,8 @@
 {
   "name": "ruby_node_task",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "",
-  "main": "index.js",
+  "main": "nodeTask.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_task
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Friend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemon_controller
@@ -37,7 +37,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/node_task.rb
-- lib/node_task/index.js
+- lib/node_task/nodeTask.js
 - lib/node_task/node_modules/ndjson/cli.js
 - lib/node_task/node_modules/ndjson/collaborators.md
 - lib/node_task/node_modules/ndjson/index.js