sails 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdca82274162d55762d2eddeb183930b7e0b77a5
-  data.tar.gz: 6008de27f43aed4eec5c4d2935abb318a5e64f46
+  metadata.gz: 2e74e7c5aa4367c6ff007908da99902fd191e3d5
+  data.tar.gz: 3c0809e759597d4d24e9a11d954955f470d80d45
 SHA512:
-  metadata.gz: 0a8a8dedb82895595fa18613dd058ed6c4f91f8db83cd10d8e3a02a51d85c3490c5a364d38cfa1c8f1ed55c7dd2535763b593223c61bd62d54d092a6758cba53
-  data.tar.gz: e7ee9fd640638548ed95a81a65bf1443c84fb09531d74c8cf70397f233e022979d4b4c16780400491a2885e900c14eec7f7944b6fc23d27607798f561f8d93c8
+  metadata.gz: c8bd636249f59c425071153d49efc3820362af838065ba647f5677928fb6cf69f7a3954358679336ddf94e01c5e31be6583a9092654b62b727e29c39f20b87b8
+  data.tar.gz: 902bdd6d4b2827e082ab333e4c0d0c0c6523992be83717141e68f3080d6897bddb1b23077ccc4ccbf7e1bfd16ac714da0b59ab9088849bf778d3bb5d375acb03

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.3 / 2014-12-22
+
+- Fix zombie process on restart in some Linux systems.
+
 ## 0.1.2 / 2014-12-17
 
 - `sails restart` use kill -USR2 signal, not kill master process.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sails (0.1.1)
+    sails (0.1.2)
       activesupport (>= 3.2.0)
       thor
       thrift (>= 0.9.0)
@@ -19,7 +19,7 @@ GEM
     diff-lcs (1.2.5)
     i18n (0.6.11)
     json (1.8.1)
-    minitest (5.4.3)
+    minitest (5.5.0)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)

data/lib/sails/daemon.rb

@@ -44,6 +44,8 @@ module Sails
           log_file = Sails.root.join("log/#{Sails.env}.log")
           system "tail -f #{log_file}"
           Process.waitpid(@master_pid)
+        else
+          exit
         end
       end
 
@@ -59,7 +61,7 @@ module Sails
 
       def fork_master_process!
         fork do
-          $PROGRAM_NAME = self.app_name + " [master]"
+          $PROGRAM_NAME = self.app_name + " [sails master]"
           @child_pid = fork_child_process!
 
           Signal.trap("QUIT") {
@@ -68,8 +70,7 @@ module Sails
           }
 
           Signal.trap("USR2") {
-            puts @child_pid.inspect
-            Process.kill("QUIT", @child_pid)
+            Process.kill("USR2", @child_pid)
           }
 
           loop do
@@ -77,7 +78,6 @@ module Sails
             begin
               Process.getpgid(@child_pid)
             rescue Errno::ESRCH => e
-              # puts "Child not found, will restart..."
               @child_pid = fork_child_process!
             end
           end
@@ -85,15 +85,21 @@ module Sails
       end
 
       def fork_child_process!
-        fork do
-          $PROGRAM_NAME = self.app_name
-          Sails.start!(self.mode)
-
+        pid = fork do
+          $PROGRAM_NAME = self.app_name + " [sails child]"
+          Signal.trap("QUIT") {
+            exit
+          }
+          
           Signal.trap("USR2") {
             # TODO: reload Sails in current process
             exit
           }
+          Sails.start!(self.mode)          
         end
+        # http://ruby-doc.org/core-1.9.3/Process.html#detach-method
+        Process.detach(pid)
+        return pid
       end
 
       def stop_process

data/lib/sails/service/interface.rb

@@ -50,7 +50,6 @@ module Sails
             status = "Failed #{e.try(:code)}"
             raise e
           rescue => e
-            puts "------- #{e.inspect}"
             if defined?(ActiveRecord) && e.is_a?(ActiveRecord::RecordNotFound)
               status = "Not Found"
               code = 404

data/lib/sails/version.rb

@@ -1,5 +1,5 @@
 module Sails
   def self.version
-    "0.1.2"
+    "0.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jason Lee
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport