mlanett-daemons 1.0.13 → 1.1.10.2

data/Gemfile.lock

@@ -1,17 +1,27 @@
 PATH
   remote: .
   specs:
-    daemons (1.0.13)
+    mlanett-daemons (1.1.10.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    diff-lcs (1.2.4)
     rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.0)
-  daemons!
+  mlanett-daemons!
   rake
+  rspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2007 Thomas Uehlinger
+Copyright (c) 2005-2012 Thomas Uehlinger
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -20,10 +20,3 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
-
-This license does not apply to daemonize.rb, which is was written by 
-Travis Whitton und published under the following license:
-
-The Daemonize extension module is copywrited free software by Travis Whitton
-<whitton@atlantic.net>. You can redistribute it under the terms specified in
-the COPYING file of the Ruby distribution.

data/README-mlanett.rdoc

@@ -0,0 +1,8 @@
+== What is Daemons?
+
+This is a fork of the original svn upstream by Thomas Uehlinger.
+
+It incorporates some bug fixes from myself and some other git repos,
+which are forked from an older version of the upstream.
+
+This gem is pushed to rubygems as mlanett-daemons.

data/{README → README.rdoc}

@@ -1,4 +1,4 @@
-= Daemons Version 1.0.11
+= Daemons Version 1.1.10
 
 (See Releases for release-specific information)
 
@@ -14,12 +14,9 @@ Besides this basic functionality, daemons offers many advanced features like <i>
 and logging (in case your ruby script crashes) and <i>monitoring</i> and automatic restarting of your processes
 if they crash.
 
-Daemons includes the <tt>daemonize.rb</tt> script written by <i>Travis Whitton</i> to do the daemonization
-process.
-
 == Basic Usage
 
-You can use Daemons in four differet ways:
+You can use Daemons in four different ways:
 
 === 1. Create wrapper scripts for your server scripts or applications
 
@@ -184,11 +181,12 @@ The RDoc documentation is also online at http://daemons.rubyforge.org
 
 == Author
 
-Written in 2005-2008 by Thomas Uehlinger <mailto:th.uehlinger@gmx.ch>.
+Written 2005-2013 by Thomas Uehlinger <mailto:th.uehlinger@gmx.ch>.
+Anonymous SVN checkout is available with "svn checkout http://daemons.rubyforge.org/svn/".
 
 == License
 
-Copyright (c) 2005-2008 Thomas Uehlinger
+Copyright (c) 2005-2013 Thomas Uehlinger
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -211,13 +209,6 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-This license does not apply to daemonize.rb, which is was written by 
-Travis Whitton und published under the following license:
-
-The Daemonize extension module is copywrited free software by Travis Whitton
-<whitton@atlantic.net>. You can redistribute it under the terms specified in
-the COPYING file of the Ruby distribution.
-
 == Feedback and other resources
 
-At http://rubyforge.org/projects/daemons.
+At http://rubyforge.org/projects/daemons .

data/Releases

@@ -1,26 +1,100 @@
 = Daemons Release History
 
-== Release 1.0.10: November 16, 2007
+== Release 1.1.10: June 26, 2013
+
+* fix Pid.running? rescuing timeout exceptions (thanks to Geraud Boyer)
+* monitor.rb/application.rb/application_group.rb: handle :monitor and :multiple in combination correctly
+  (thanks to Prakash Murthy).
+
+== Release 1.1.9: August 10, 2012
+
+* daemonize.rb: do srand in the forked child process both in daemonize and call_as_daemon 
+  (thanks to Andrew Havens).
+
+== Release 1.1.8: February 7, 2012
+
+* rename to daemonization.rb to daemonize.rb (and Daemonization to Daemonize) to 
+  ensure compatibility.
+
+== Release 1.1.7: February 6, 2012
+
+* start_proc: Write out the PID file in the newly created proc to avoid race conditions.
+* daemonize.rb: remove to simplify licensing (replaced by daemonization.rb).
+
+== Release 1.1.6: January 18, 2012
+
+* Add the :app_name option for the "call" daemonization mode.
+
+== Release 1.1.5: December 19, 2011
+
+* Catch the case where the pidfile is empty but not deleted 
+  and restart the app (thanks to Rich Healey)
+
+== Release 1.1.4: June 17, 2011
+
+* Do not change the umask to 0000 when daemonizing anymore, just leave it as it 
+  was (thanks to Jon Botelho).
+
+== Release 1.1.3: April 14, 2011
+
+* Fixed a bug in Application.stop: the cached pid number needs to
+  be used to check for the status of a killed process (thanks to Jimmy Sieben).
+  
+== Release 1.1.2: March 29, 2011
+
+* Fixed gemspec to include all needed files.
+  
+== Release 1.1.1: March 29, 2011
+
+* Make the logging facilities work in :mode => :none (i.e. when calling 
+  Daemons.daemonize) (thanks to the input from Peter Hegedus).
+  
+== Release 1.1.0: June 20, 2010
+
+* Honour the options[:app_name] in Daemons.daemonize (thanks to Ryan Tecco).
+* Included a new option :stop_proc to specify a proc that will be called when a 
+  daemonized process receives a request to stop (thanks to Dave Dupre).
+* Only delete the pidfile if the current pid is the original pid (ghazel).
+* Start when restart but no application running (pcreux).
+* Silently continue if there is no pidfile (ghazel).
+* We now per default wait for processes to stop and
+  kill them automatically it if they do not stop within a given time 
+  (force_kill_waittime). Use the option --no_wait to not wait for processes to 
+  stop.
+* Set log files mode to 0644 (mikehale).
+* Set pid file permissions to 0644 (mikehale).
+* Added ability to change process uid/gid (mikehale).
+* Fix for: If you happen to start a daemon from a process that has open file 
+  descriptors these will stay open. As it is daemonize.rb only closes ruby IO 
+  objects (thanks to Han Holl).
+* New reload command (SIGHUP) (thanks to Michael Schuerig).
+
+== Release 1.0.10: March 21, 2008
 
 * By default, we now delete stray pid-files (i.e. pid-files which result for 
-  example from a killed daemon) automatically. This function can be deactivated by
-  passing :keep_pid_files => true as an option.
-* All pid files of :multiple daemons new get deleted correctly upon exit of the daemons (reported by Han Holl).
+  example from a killed daemon) automatically. This function can be deactivated 
+  by passing :keep_pid_files => true as an option.
+* All pid files of :multiple daemons new get deleted correctly upon exit of the 
+  daemons (reported by Han Holl).
 * Use the signal 'KILL' instead of 'TERM' on Windows platforms.
-* Use exit! in trap('TERM') instead of exit when option :hard_exit is given (thanks to Han Holl).
+* Use exit! in trap('TERM') instead of exit when option :hard_exit is given 
+  (thanks to Han Holl).
 * Did some clarification on the exception log.
 
 == Release 1.0.9: October 29, 2007
 
-* fixed a severe bug in the new Pid.running? function: function returned true if the process did not exist (thanks to Jeremy Lawler).
+* fixed a severe bug in the new Pid.running? function: function returned true if
+  the process did not exist (thanks to Jeremy Lawler).
 
 == Release 1.0.8: September 24, 2007
 
-* new Pid.running? function. Checking whether a process exists by sending signal '0' (thanks to Dru Nelson).
+* new Pid.running? function. Checking whether a process exists by sending 
+  signal '0' (thanks to Dru Nelson).
 
 == Release 1.0.7: July 7, 2007
 
-* Patch to fix wrong ARGV when using :exec (in def start_exec: Kernel.exec(script(), *(@app_argv || []))) (thanks to Alex McGuire).
+* Patch to fix wrong ARGV when using :exec (in def start_exec: 
+  Kernel.exec(script(), *(@app_argv || []))) (thanks to Alex McGuire).
 
 == Release 1.0.6: Mai 8, 2007
 
@@ -37,7 +111,8 @@
 
 * Document the :log_output option (thanks to Andrew Kuklewicz).
 * Set STDOUT.sync = true when redirecting to a logfile (thanks to Andrew Kuklewicz).
-* Should now run also correctly when there is no working 'ps ax' on the system (thanks to Daniel Kehoe).
+* Should now run also correctly when there is no working 'ps ax' on the system 
+  (thanks to Daniel Kehoe).
 
 == Release 1.0.3: November 1, 2006
 

data/TODO

@@ -1,6 +1,2 @@
-* write the README (2005-02-07) *DONE*
-* write some real tests (2005-02-08)
-* document the new options (2005-03-14) *DONE*
-* start/stop with --force options (2005-04-05)
-* option to give some console output on start/stop commands (2005-04-05)
+* put TODOS here
 

data/daemons.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", ">= 1.0"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/examples/call/call.rb

@@ -18,6 +18,7 @@ testfile = File.expand_path(__FILE__) + '.log'
 #
 
 options = {
+  :app_name => 'mytask',
 #  :ontop => true,
   :multiple => true
 }

data/examples/daemonize/daemonize.rb

@@ -11,10 +11,17 @@ end
 require 'daemons'
 
 
-testfile = File.expand_path(__FILE__) + '.log'
+options = {
+  :log_output => true
+}
 
-Daemons.daemonize
+
+testfile = File.expand_path(__FILE__) + '.txt'
+
+Daemons.daemonize(options)
+
+puts "some output..."
 
 File.open(testfile, 'w') {|f|
   f.write("test")
-}
+}

data/examples/run/ctrl_hanging.rb

@@ -0,0 +1,19 @@
+lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
+
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
+  $LOAD_PATH.unshift lib_dir
+else
+  begin; require 'rubygems'; rescue ::Exception; end
+end
+
+require 'daemons'
+
+options = {
+  #:mode => :exec,
+  :multiple => true,
+  :no_pidfiles => true,
+  :force_kill_waittime => 5
+  #:force_kill_waittime => -1    # do not wait before killing -9
+}
+
+Daemons.run(File.join(File.dirname(__FILE__), 'myserver_hanging.rb'), options)

data/examples/run/ctrl_monitor_multiple.rb

@@ -0,0 +1,18 @@
+lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
+
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
+  $LOAD_PATH.unshift lib_dir
+else
+  begin; require 'rubygems'; rescue ::Exception; end
+end
+
+require 'daemons'
+
+
+options = {
+  :multiple => true,
+  :monitor => true,
+  :log_output => true,
+}
+
+Daemons.run(File.join(File.dirname(__FILE__), 'myserver_crashing.rb'), options)

data/examples/run/ctrl_normal.rb

@@ -8,5 +8,4 @@ end
 
 require 'daemons'
 
-
 Daemons.run(File.join(File.dirname(__FILE__), 'myserver.rb'))

data/examples/run/ctrl_proc.rb.output

@@ -99,3 +99,23 @@ ping from proc!
 ping from proc!
 ping from proc!
 ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ctrl_proc.rb: process with pid 3187 started.
+ping from proc!
+ping from proc!
+ping from proc!
+ctrl_proc.rb: process with pid 1659 started.
+ping from proc!
+ping from proc!
+ctrl_proc.rb: process with pid 17561 started.
+ping from proc!
+ping from proc!
+ctrl_proc.rb: process with pid 18362 started.
+ping from proc!
+ping from proc!

data/examples/run/ctrl_proc_rand.rb

@@ -0,0 +1,23 @@
+lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
+
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
+  $LOAD_PATH.unshift lib_dir
+else
+  begin; require 'rubygems'; rescue ::Exception; end
+end
+
+
+require 'daemons'
+
+
+Daemons.run_proc('myscript') do
+  loop do
+    file = File.open('/tmp/myscript.log', 'a')
+    file.write(Random.rand)   # breaks without seeding
+    # file.write(Random.new.rand)  # works without seeding
+    # file.write(rand) # also works, but this is Kernel.rand() so its different
+    file.write("\n")
+    file.close()
+    sleep 2
+  end
+end

data/examples/run/ctrl_slowstop.rb

@@ -0,0 +1,16 @@
+lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
+
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
+  $LOAD_PATH.unshift lib_dir
+else
+  begin; require 'rubygems'; rescue ::Exception; end
+end
+
+require 'daemons'
+
+options = {
+  #:force_kill_waittime => 40
+  #:force_kill_waittime => -1    # do not wait before killing -9
+}
+
+Daemons.run(File.join(File.dirname(__FILE__), 'myserver_slowstop.rb'), options)

data/examples/run/myserver_crashing.rb

@@ -5,9 +5,9 @@
 
 loop do
   puts 'ping from myserver.rb!'
-  puts 'this example server will crash in 3 seconds...'
+  puts 'this example server will crash in 10 seconds...'
   
-  sleep(3)
+  sleep(10)
   
   puts 'CRASH!'
   raise 'CRASH!'

data/examples/run/myserver_hanging.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+
+# This is myserver.rb, an example server that is to be controlled by daemons
+# and that does nothing really useful at the moment.
+#
+# Don't run this script by yourself, it can be controlled by the ctrl*.rb scripts.
+
+trap('TERM') {
+  puts "received TERM"
+  
+  loop do
+    puts 'hanging!'
+    sleep(3)
+  end
+}
+
+loop do
+  puts 'ping from myserver.rb!'
+  sleep(3)
+end

data/examples/run/myserver_slowstop.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+
+# This is myserver_slowstop.rb, an example server that is to be controlled by daemons
+# and that does nothing really useful at the moment.
+#
+# Don't run this script by yourself, it can be controlled by the ctrl*.rb scripts.
+
+trap('TERM') {
+  puts "received TERM"
+  
+  # simulate the slow stopping
+  sleep(10)
+  
+  exit
+}
+
+loop do
+  puts 'ping from myserver.rb!'
+  sleep(3)
+end