light-daemon 0.9.7 → 0.9.8

data/README

@@ -1,7 +1,8 @@
-light-daemon is a ruby gem. It could help developers quickly build a daemon which prefok worker processes and monitor them.
+Light-daemon is a ruby gem. It could help developers quickly build a daemon which preforks worker processes and monitors them.
+
 The usage is very simple:
 
-    #---------------------------------------------------------------------------------------------
+    #------------------------------------------------------------------------------
     require 'rubygems'
     require 'light_daemon'
 
@@ -16,19 +17,17 @@ The usage is very simple:
       end
     end
     
-    LightDaemon::Daemon.start(Client.new, :children=> 2, :pid_file => "/tmp/light-daemon.pid" )
-    #---------------------------------------------------------------------------------------------
+    LightDaemon::Daemon.start(Client.new, :children=> 2, :pid_file => "/tmp/light-daemon.pid")
+    #------------------------------------------------------------------------------
 
 What you need to do is:
+
 1. Create your worker class. Define a method "call" and put the real work into it. 
 2. The method "call" needs to return true for the daemon to continuously call it.
-3. You need to tell the daemon how many worker processes you want and a filename for daemon to store
-   the PID of the daemon process.
-4. If the method "call" returns false, the daemon will kill this work process and create a new one. 
-   This would be very helpful if your code might have memory leaking and you want it to restart after 
-   certain criteria is met. An example is as following:
+3. You need to tell the daemon how many worker processes you want and a filename for daemon to store the PID of the daemon process.
+4. If the method "call" returns false, the daemon will kill this worker process and create a new one. This would be very helpful if your code might have memory leaking and you want it to restart after certain criteria is met. An example is as following:
 
-    #---------------------------------------------------------------------------------------------
+    #------------------------------------------------------------------------------
     require 'rubygems'
     require 'light_daemon'
 
@@ -46,12 +45,10 @@ What you need to do is:
     end
     
     LightDaemon::Daemon.start(Client.new, :children=> 2, :pid_file => "/tmp/light-daemon.pid" )
-    #---------------------------------------------------------------------------------------------
-
+    #------------------------------------------------------------------------------
 
 
 
 Yi Zhang
 yzhang[dot]wa[at]gmail[dot]com
 3/11/2012
-

data/lib/light_daemon.rb

@@ -5,7 +5,7 @@ module LightDaemon
     class << self
       def start(obj, options={})
         @options = self.make_options(options)
-	@pid_file = @options[:pid_file]
+        @pid_file = @options[:pid_file]
         if self.get_pid
           raise "The pid file \"#{@pid_file}\" existed already. You need to stop the daemon first."
         end
@@ -15,21 +15,21 @@ module LightDaemon
       def stop(pid_file=DEFAULT_PID_FILE)
         @pid_file = pid_file
         if(pid = self.get_pid)
-	  begin
-	    Process.kill("TERM", pid)
-	  rescue Errno::ESRCH   
-	    # no such process. do nothing
+          begin
+            Process.kill("TERM", pid)
+          rescue Errno::ESRCH   
+            # no such process. do nothing
           end
-	  self.clear_pid
+          self.clear_pid
         end
       end
 
       def get_pid
         return nil unless File.exist?(@pid_file)
-	begin 
-	  File.open(@pid_file) {|f| f.read}.to_i
+        begin 
+          File.open(@pid_file) {|f| f.read}.to_i
         rescue
-	  nil
+          nil
         end
       end
 
@@ -45,7 +45,7 @@ module LightDaemon
         options[:children] ||= 1
         options[:monitor_cycle] ||= 10    # seconds
         options[:pid_file] ||= DEFAULT_PID_FILE
-	options
+        options
       end
 
       # for debugging 
@@ -74,19 +74,19 @@ module LightDaemon
           @processes.each do |pid|
             Process.kill("TERM", pid)
           end
-  	  
+
           sleep(3)
           options[:children].times do 
-    	    @processes.size.times do
-      	      pid = @processes.shift
-      	      if process_alive?(pid)
-      	        @processes << pid
-      	        sleep(3)
+            @processes.size.times do
+              pid = @processes.shift
+              if process_alive?(pid)
+                @processes << pid
+                sleep(3)
               end
-    	    end  
+            end  
           end
-  	  @processes.each do |pid|
-  	    Process.kill(9, pid)
+          @processes.each do |pid|
+            Process.kill(9, pid)
           end
         end
         $keep_running = false
@@ -110,35 +110,29 @@ module LightDaemon
       @options[:children].times do 
         if pid = fork 
           @processes << pid
-	  Process.detach(pid)
+          Process.detach(pid)
         else
-	  set_child
-          while($keep_running)
-	    break unless @obj.send(:call)
-	  end
-	  return
-        end	
+          run_child
+          return
+        end
       end
 
       while($keep_running)
         sleep(@options[:monitor_cycle])
 
-	@processes.each_with_index do |pid, index|
+        @processes.each_with_index do |pid, index|
           unless process_alive?(pid)
             if pid = fork
-	      @processes[index] = pid
-	      Process.detach(pid)
-	      sleep(2)
-	    else 
-	      set_child 
-              while($keep_running)
-	        break unless @obj.send(:call)
-	      end
+              @processes[index] = pid
+              Process.detach(pid)
+              sleep(2)
+            else 
+              run_child
               return
-	    end  
+            end  
           else
           end
-	  sleep(1)
+          sleep(1)
         end
       end
       self.class.clear_pid(@options[:pid_file])
@@ -148,7 +142,7 @@ module LightDaemon
     def daemonize
       fork && exit
       unless Process.setsid
-	raise 'cannot detach from controlling terminal'
+        raise 'cannot detach from controlling terminal'
       end
 
       trap 'SIGHUP', 'IGNORE'
@@ -160,8 +154,12 @@ module LightDaemon
       STDERR.sync = true
     end
 
-    def set_child 
+    def run_child
       @is_child = true
+      target_obj = (@obj.class.name == 'String')? Object.const_get(@obj).new : @obj
+      while($keep_running)
+        break unless target_obj.send(:call)
+      end
     end
   end
 end

metadata

@@ -1,68 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: light-daemon
-version: !ruby/object:Gem::Version 
-  hash: 53
+version: !ruby/object:Gem::Version
+  version: 0.9.8
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 7
-  version: 0.9.7
 platform: ruby
-authors: 
+authors:
 - Yi Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-11 00:00:00 -08:00
-default_executable: 
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies: []
-
 description: A very simple and light ruby daemon API
 email: yzhang.wa@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - lib/light_daemon.rb
-has_rdoc: true
 homepage: http://github.com/yzhanginwa/light-daemon
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Light Daemon is awesome!
 test_files: []
-