mlanett-daemons 1.0.13 → 1.1.10.2

data/lib/daemons/etc_extension.rb

@@ -0,0 +1,12 @@
+require 'etc'
+
+Etc.instance_eval do
+  def groupname(gid)
+    Etc.group {|e| return e.name if gid == e.gid }
+    nil
+  end
+  def username(uid)
+    Etc.passwd {|e| return e.name if uid == e.uid }
+    nil
+  end
+end

data/lib/daemons/exceptions.rb

@@ -25,4 +25,7 @@ module Daemons
     
   end
   
+  class TimeoutError < Error
+  end
+  
 end

data/lib/daemons/monitor.rb

@@ -1,3 +1,5 @@
+require 'daemons/exceptions'
+
 
 module Daemons
 
@@ -38,29 +40,33 @@ module Daemons
       end
     end
     
-    def watch(applications)
-      sleep(30)
+    def watch(application_group)
+      sleep(5)
       
       loop do
-        applications.each {|a|
-          sleep(10)
-          
+        application_group.applications.each {|a|
           unless a.running?
             a.zap!
             
-            Process.detach(fork { a.start })
+            sleep(1)
+            
+            Process.detach(fork { a.start(restart=true) })
+            
+            sleep(5)
             
-            sleep(10)
+            #application_group.setup
           end
         }
         
-        sleep(30)
+        #sleep(5)
+        #application_group.setup
+        #sleep(30)
       end
     end
     private :watch
     
     
-    def start_with_pidfile(applications)
+    def start_with_pidfile(application_group)
       fork do
         Daemonize.daemonize(nil, @app_name)
         
@@ -81,7 +87,7 @@ module Daemons
   #           exit
   #         }
           
-          watch(applications)
+          watch(application_group)
         rescue ::Exception => e
           begin
             File.open(@app.logfile, 'a') {|f|
@@ -98,19 +104,19 @@ module Daemons
     end
     private :start_with_pidfile
     
-    def start_without_pidfile(applications)
-      Thread.new { watch(applications) }
+    def start_without_pidfile(application_group)
+      Thread.new { watch(application_group) }
     end
     private :start_without_pidfile
     
     
-    def start(applications)
-      return if applications.empty?
+    def start(application_group)
+      return if application_group.applications.empty?
       
       if @pid.kind_of?(PidFile)
-        start_with_pidfile(applications)
+        start_with_pidfile(application_group)
       else
-        start_without_pidfile(applications)
+        start_without_pidfile(application_group)
       end
     end
     
@@ -119,9 +125,11 @@ module Daemons
       begin
         pid = @pid.pid
         Process.kill(Application::SIGNAL, pid)
-        while Pid.running?(pid)
-          sleep 0.1
-        end
+		    Timeout::timeout(5, TimeoutError) {      
+          while Pid.running?(pid)
+            sleep(0.1)
+          end
+        }
       rescue ::Exception => e
         puts "#{e} #{pid}"
         puts "deleting pid-file."

data/lib/daemons/pid.rb

@@ -1,13 +1,4 @@
-WINDOWS  = RUBY_PLATFORM.match(/(win|w)32$/)
-ONE_NINE = RUBY_VERSION >= "1.9"
-if WINDOWS
-  if ONE_NINE
-    require 'open3'
-  else
-    require 'rubygems'
-    require 'win32/open3'
-  end
-end
+require 'daemons/exceptions'
 
 
 module Daemons
@@ -18,8 +9,8 @@ module Daemons
       # We have seen an odd problem where the pid file exists but is empty
       # In this case we want to not send a kill but we do want to zap the file
       # Thus while technically pid==0 => this process => running=true, treat it as running=false
-      return false if pid == 0
-
+      return false if ! pid || pid == 0
+      
       # Check if process is in existence
       # The simplest way to do this is to send signal '0'
       # (which is a single system call) that doesn't actually
@@ -27,6 +18,8 @@ module Daemons
       begin
         Process.kill(0, pid)
         return true
+      rescue TimeoutError
+        raise
       rescue Errno::ESRCH
         return false
       rescue ::Exception   # for example on EPERM (process exists but does not belong to us)
@@ -63,6 +56,7 @@ module Daemons
   #  end
     
     
+    
     # Returns the directory that should be used to write the pid file to
     # depending on the given mode.
     # 
@@ -100,11 +94,16 @@ module Daemons
     def pid=(p)
     end
     
+    # Check whether the process is running
+    def running?
+      return Pid.running?(pid())
+    end
+    
     # Cleanup method
     def cleanup
     end
     
-    # Exists? method
+    # Exist? method
     def exist?
       true
     end
@@ -112,4 +111,4 @@ module Daemons
   end  
   
   
-end
+end

data/lib/daemons/pidfile.rb

@@ -34,8 +34,10 @@ module Daemons
     attr_reader :dir, :progname, :multiple, :number
 
     def PidFile.find_files(dir, progname, delete = false)
-      files = Dir[File.join(dir, "#{progname}*.pid")]
-      
+      files = Dir[File.join(dir, "#{progname}*.pid")].select {|f|
+        f =~ /#{progname}\d*\.pid/
+      }
+
       files.delete_if {|f| not (File.file?(f) and File.readable?(f))}
       if delete 
         files.delete_if do |f|
@@ -76,7 +78,7 @@ module Daemons
           @number += 1
         end
         
-        if @number == 1024
+        if @number >= 1024
           raise RuntimeException('cannot run more than 1024 instances of the application')
         end
       end
@@ -92,6 +94,7 @@ module Daemons
     
     def pid=(p)
       File.open(filename, 'w') {|f|
+        f.chmod(0644)
         f.puts p   #Process.pid
       }
     end
@@ -101,11 +104,15 @@ module Daemons
     end
 
     def pid
-      File.open(filename) {|f|
-        return f.gets.to_i
-      }
+      begin
+        File.open(filename) {|f|
+          return f.gets.to_i
+        }
+      rescue ::Exception
+        return nil
+      end
     end
 
   end
   
-end
+end

data/lib/daemons/pidmem.rb

@@ -5,6 +5,15 @@ module Daemons
 
   class PidMem < Pid
     attr_accessor :pid
+    
+    def PidMem.existing(numeric_pid)
+      new_instance = PidMem.allocate
+      
+      new_instance.instance_variable_set(:@pid, numeric_pid)
+      
+      return new_instance
+    end
+    
   end
 
 end

data/lib/daemons/version.rb

@@ -1,3 +1,3 @@
 module Daemons
-  VERSION = "1.0.13"
+  VERSION = "1.1.10.2"
 end

data/spec/pidfile_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Daemons::PidFile do
+  describe "#find_files" do
+    it 'does not include files with shared prefix' do
+      Dir.stub('[]') { %w{srv.pid srv123.pid srv-other.pid} }
+      File.stub(:readable?) { true }
+      File.stub(:file?) { true }
+      expect(Daemons::PidFile.find_files('/', 'srv')).to eql %w{srv.pid srv123.pid}
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'daemons'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mlanett-daemons
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.1.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Daemons provides an easy way to wrap existing ruby scripts (for example
   a self-written server)  to be run as a daemon and to be controlled by simple start/stop/restart
   commands.  You can also call blocks as daemons and control them from the parent
@@ -59,12 +75,12 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README
+- README-mlanett.rdoc
+- README.rdoc
 - Rakefile
 - Releases
 - TODO
 - daemons.gemspec
-- daemons.tmproj
 - examples/call/call.rb
 - examples/call/call.rb.log
 - examples/call/call_monitor.rb
@@ -72,8 +88,10 @@ files:
 - examples/run/ctrl_crash.rb
 - examples/run/ctrl_exec.rb
 - examples/run/ctrl_exit.rb
+- examples/run/ctrl_hanging.rb
 - examples/run/ctrl_keep_pid_files.rb
 - examples/run/ctrl_monitor.rb
+- examples/run/ctrl_monitor_multiple.rb
 - examples/run/ctrl_multiple.rb
 - examples/run/ctrl_normal.rb
 - examples/run/ctrl_ontop.rb
@@ -82,52 +100,22 @@ files:
 - examples/run/ctrl_proc.rb.output
 - examples/run/ctrl_proc_multiple.rb
 - examples/run/ctrl_proc_multiple.rb.output
+- examples/run/ctrl_proc_rand.rb
 - examples/run/ctrl_proc_simple.rb
+- examples/run/ctrl_slowstop.rb
 - examples/run/myserver.rb
 - examples/run/myserver_crashing.rb
-- examples/run/myserver_crashing.rb.output
 - examples/run/myserver_exiting.rb
-- html/classes/Daemonize.html
-- html/classes/Daemons.html
-- html/classes/Daemons/Application.html
-- html/classes/Daemons/ApplicationGroup.html
-- html/classes/Daemons/CmdException.html
-- html/classes/Daemons/Controller.html
-- html/classes/Daemons/Error.html
-- html/classes/Daemons/Exception.html
-- html/classes/Daemons/Monitor.html
-- html/classes/Daemons/Optparse.html
-- html/classes/Daemons/Pid.html
-- html/classes/Daemons/PidFile.html
-- html/classes/Daemons/PidMem.html
-- html/classes/Daemons/RuntimeException.html
-- html/classes/Daemons/SystemError.html
-- html/created.rid
-- html/files/README.html
-- html/files/Releases.html
-- html/files/TODO.html
-- html/files/lib/daemons/application_group_rb.html
-- html/files/lib/daemons/application_rb.html
-- html/files/lib/daemons/cmdline_rb.html
-- html/files/lib/daemons/controller_rb.html
-- html/files/lib/daemons/daemonize_rb.html
-- html/files/lib/daemons/exceptions_rb.html
-- html/files/lib/daemons/monitor_rb.html
-- html/files/lib/daemons/pid_rb.html
-- html/files/lib/daemons/pidfile_rb.html
-- html/files/lib/daemons/pidmem_rb.html
-- html/files/lib/daemons_rb.html
-- html/fr_class_index.html
-- html/fr_file_index.html
-- html/fr_method_index.html
-- html/index.html
-- html/rdoc-style.css
+- examples/run/myserver_hanging.rb
+- examples/run/myserver_slowstop.rb
 - lib/daemons.rb
 - lib/daemons/application.rb
 - lib/daemons/application_group.rb
+- lib/daemons/change_privilege.rb
 - lib/daemons/cmdline.rb
 - lib/daemons/controller.rb
 - lib/daemons/daemonize.rb
+- lib/daemons/etc_extension.rb
 - lib/daemons/exceptions.rb
 - lib/daemons/monitor.rb
 - lib/daemons/pid.rb
@@ -135,10 +123,8 @@ files:
 - lib/daemons/pidmem.rb
 - lib/daemons/version.rb
 - setup.rb
-- test/call_as_daemon.rb
-- test/tc_main.rb
-- test/test1.rb
-- test/testapp.rb
+- spec/pidfile_spec.rb
+- spec/spec_helper.rb
 homepage: http://daemons.rubyforge.org
 licenses: []
 post_install_message: 
@@ -164,7 +150,5 @@ signing_key:
 specification_version: 3
 summary: A toolkit to create and control daemons in different ways
 test_files:
-- test/call_as_daemon.rb
-- test/tc_main.rb
-- test/test1.rb
-- test/testapp.rb
+- spec/pidfile_spec.rb
+- spec/spec_helper.rb

data/daemons.tmproj

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>documents</key>
-	<array>
-		<dict>
-			<key>expanded</key>
-			<true/>
-			<key>name</key>
-			<string>daemons</string>
-			<key>regexFolderFilter</key>
-			<string>!.*/(\.[^/]*|CVS|_darcs|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
-			<key>sourceDirectory</key>
-			<string></string>
-		</dict>
-	</array>
-	<key>fileHierarchyDrawerWidth</key>
-	<integer>200</integer>
-	<key>metaData</key>
-	<dict>
-		<key>html/classes/Daemons.html</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>28</integer>
-				<key>line</key>
-				<integer>553</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>533</integer>
-		</dict>
-		<key>lib/daemons/application_group.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>61</integer>
-		</dict>
-	</dict>
-	<key>showFileHierarchyDrawer</key>
-	<true/>
-	<key>windowFrame</key>
-	<string>{{419, 58}, {733, 788}}</string>
-</dict>
-</plist>