daemons 1.1.0 → 1.1.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2007 Thomas Uehlinger
+Copyright (c) 2005-2011 Thomas Uehlinger
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -26,4 +26,4 @@ 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.
+the COPYING file of the Ruby distribution.

data/README

@@ -1,4 +1,4 @@
-= Daemons Version 1.1.0
+= Daemons Version 1.1.2
 
 (See Releases for release-specific information)
 

data/Releases

@@ -1,5 +1,14 @@
 = Daemons Release History
 
+== Release 1.1.2: March 29, 201
+
+* Fixed gemspec to include all needed files.
+  
+== Release 1.1.1: March 29, 201
+
+* 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).

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/lib/daemons.rb

@@ -66,7 +66,7 @@ require 'timeout'
 #
 module Daemons
 
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
   
   require 'daemons/daemonize'
   
@@ -97,7 +97,7 @@ module Daemons
   #                       If not given, ARGV (the parameters given to the Ruby process) will be used.
   # <tt>:dir_mode</tt>::  Either <tt>:script</tt> (the directory for writing the pid files to 
   #                       given by <tt>:dir</tt> is interpreted relative
-  #                       to the script location given by +script+) or <tt>:normal</tt> (the directory given by 
+  #                       to the script location given by +script+, the default) or <tt>:normal</tt> (the directory given by 
   #                       <tt>:dir</tt> is interpreted as a (absolute or relative) path) or <tt>:system</tt> 
   #                       (<tt>/var/run</tt> is used as the pid file directory)
   #
@@ -112,6 +112,8 @@ module Daemons
   # <tt>:backtrace</tt>:: Write a backtrace of the last exceptions to the file '[app_name].log' in the 
   #                       pid-file directory if the application exits due to an uncaught exception
   # <tt>:monitor</tt>::   Monitor the programs and restart crashed instances
+  # <tt>:log_dir</tt>::   A specific directory to put the log files into (when not given, resort to the default
+  #                       location as derived from the :dir_mode and :dir options
   # <tt>:log_output</tt>:: When given (i.e. set to true), redirect both STDOUT and STDERR to a logfile named '[app_name].output' in the pid-file directory
   # <tt>:keep_pid_files</tt>:: When given do not delete lingering pid-files (files for which the process is no longer running).
   # <tt>:hard_exit</tt>:: When given use exit! to end a daemons instead of exit (this will for example
@@ -184,7 +186,7 @@ module Daemons
     # we do not have a script location so the the :script :dir_mode cannot be used, change it to :normal
     if [nil, :script].include? options[:dir_mode]
       options[:dir_mode] = :normal
-      options[:dir] = File.expand_path('.')
+      options[:dir] ||= File.expand_path('.')
     end
     
     @controller = Controller.new(options, options[:ARGV] || ARGV)
@@ -255,12 +257,27 @@ module Daemons
   # <tt>:ontop</tt>::     When given, stay on top, i.e. do not daemonize the application 
   # <tt>:backtrace</tt>:: Write a backtrace of the last exceptions to the file '[app_name].log' in the 
   #                       pid-file directory if the application exits due to an uncaught exception
+  # <tt>:app_name</tt>::  The name of the application. This will be
+  #                       used to contruct the name of the pid files
+  #                       and log files. Defaults to the basename of
+  #                       the script.
+  # <tt>:dir_mode</tt>::  Either <tt>:script</tt> (the directory for writing files to 
+  #                       given by <tt>:dir</tt> is interpreted relative
+  #                       to the script location given by +script+, the default) or <tt>:normal</tt> (the directory given by 
+  #                       <tt>:dir</tt> is interpreted as a (absolute or relative) path) or <tt>:system</tt> 
+  #                       (<tt>/var/run</tt> is used as the file directory)
+  #
+  # <tt>:dir</tt>::       Used in combination with <tt>:dir_mode</tt> (description above)
+  # <tt>:log_dir</tt>::   A specific directory to put the log files into (when not given, resort to the default
+  #                       location as derived from the :dir_mode and :dir options
+  # <tt>:log_output</tt>:: When given (i.e. set to true), redirect both STDOUT and STDERR to a logfile named '[app_name].output' in the pid-file directory
   # -----
   # 
   # === Example:
   #   options = {
   #     :backtrace  => true,
-  #     :ontop      => true
+  #     :ontop      => true,
+  #     :log_output => true
   #   }
   #
   #   Daemons.daemonize(options)
@@ -268,11 +285,14 @@ module Daemons
   #   # Server loop:
   #   loop {
   #     conn = accept_conn()
+  #     puts "some text which goes to the output logfile"
   #     serve(conn)
   #   }
   #
   def daemonize(options = {})
-    @group ||= ApplicationGroup.new(options[:app_name] || 'self', options)
+    options[:script] ||= File.basename(__FILE__)
+    
+    @group ||= ApplicationGroup.new(options[:app_name] || options[:script], options)
     
     @group.new_application(:mode => :none).start
   end

data/lib/daemons/application.rb

@@ -78,9 +78,9 @@ module Daemons
     # this function is only used to daemonize the currently running process (Daemons.daemonize)
     def start_none
       unless options[:ontop]
-        Daemonize.daemonize(nil, @group.app_name) #(logfile)
+        Daemonize.daemonize(output_logfile, @group.app_name)
       else
-        Daemonize.simulate
+        Daemonize.simulate(output_logfile)
       end
       
       @pid.pid = Process.pid
@@ -138,7 +138,6 @@ module Daemons
       
       started()
       Kernel.exec(script(), *(@app_argv || []))
-      #Kernel.exec(script(), *ARGV)
     end
     
     def start_load

data/lib/daemons/cmdline.rb

@@ -10,10 +10,8 @@ module Daemons
       @options = {}
       
       @opts = OptionParser.new do |opts|
-        #opts.banner = "Usage: example.rb [options]"
         opts.banner = ""
         
-        # Boolean switch.
 #         opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
 #           @options[:verbose] = v
 #         end
@@ -37,8 +35,7 @@ module Daemons
         opts.separator ""
         opts.separator "Common options:"
 
-        # No argument, shows at tail.  This will print an options summary.
-        # Try it and see!
+        # No argument, shows at tail.  This will print an options summary
         opts.on_tail("-h", "--help", "Show this message") do
           #puts opts
           #@usage = 
@@ -47,7 +44,7 @@ module Daemons
           exit
         end
 
-        # Another typical switch to print the version.
+        # Switch to print the version.
         opts.on_tail("--version", "Show version") do
           puts "daemons version #{Daemons::VERSION}"
           exit

metadata

@@ -1,19 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: daemons
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  hash: 23
+  prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Thomas Uehlinger
-autorequire: daemons
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-20 00:00:00 +02:00
+date: 2011-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
-description: "    Daemons provides an easy way to wrap existing ruby scripts (for example a self-written server) \n    to be run as a daemon and to be controlled by simple start/stop/restart commands.\n    \n    You can also call blocks as daemons and control them from the parent or just daemonize the current\n    process.\n    \n    Besides this basic functionality, daemons offers many advanced features like exception \n    backtracing and logging (in case your ruby script crashes) and monitoring and automatic\n    restarting of your processes if they crash.\n"
+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 or just daemonize the current process.  Besides this basic functionality, daemons offers many advanced features like exception  backtracing and logging (in case your ruby script crashes) and monitoring and automatic restarting of your processes if they crash.
 email: th.uehlinger@gmx.ch
 executables: []
 
@@ -43,8 +49,6 @@ files:
 - lib/daemons/pid.rb
 - lib/daemons/pidfile.rb
 - lib/daemons/exceptions.rb
-- examples/call/call.rb
-- examples/call/call_monitor.rb
 - examples/run/ctrl_normal.rb
 - examples/run/ctrl_monitor.rb
 - examples/run/ctrl_proc.rb
@@ -55,16 +59,15 @@ files:
 - examples/run/ctrl_exit.rb
 - examples/run/myserver_crashing.rb
 - examples/run/ctrl_proc_multiple.rb
-- examples/run/ctrl_proc.rb.output
 - examples/run/ctrl_keep_pid_files.rb
 - examples/run/ctrl_proc_simple.rb
 - examples/run/ctrl_ontop.rb
 - examples/run/ctrl_crash.rb
 - examples/run/ctrl_exec.rb
 - examples/run/ctrl_hanging.rb
-- examples/run/myserver_crashing.rb.output
-- examples/run/ctrl_proc_multiple.rb.output
 - examples/run/myserver_exiting.rb
+- examples/call/call.rb
+- examples/call/call_monitor.rb
 - examples/daemonize/daemonize.rb
 has_rdoc: true
 homepage: http://daemons.rubyforge.org
@@ -76,23 +79,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: daemons
-rubygems_version: 1.3.5
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: A toolkit to create and control daemons in different ways
 test_files: []
 

data/examples/run/ctrl_proc.rb.output

@@ -1,101 +0,0 @@
-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!
-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!
-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!
-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!
-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!
-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!
-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!
-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!
-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!
-ping from proc!
-ping from proc!

data/examples/run/ctrl_proc_multiple.rb.output

@@ -1,2 +0,0 @@
-
-hello

data/examples/run/myserver_crashing.rb.output

@@ -1,30 +0,0 @@
-/home/uehli/Desktop/daemons-current/examples/myserver_crashing.rb:13: CRASH! (RuntimeError)
-	from /home/uehli/Desktop/daemons-current/examples/myserver_crashing.rb:6:in `loop'
-	from /home/uehli/Desktop/daemons-current/examples/myserver_crashing.rb:6
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:116:in `load'
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:116:in `run_via_load'
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:90:in `start'
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:359:in `run'
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:469:in `run'
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:468:in `call'
-	from /home/uehli/Desktop/daemons-current/lib/daemons/cmdline.rb:94:in `catch_exceptions'
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:468:in `run'
-	from ctrl_crash.rb:17
-ping from myserver.rb!
-this example server will crash in 3 seconds...
-CRASH!
-ping from myserver.rb!
-this example server will crash in 3 seconds...
-CRASH!
-/Users/uehli/Projects/daemons-proj/examples/run/myserver_crashing.rb:13: CRASH! (RuntimeError)
-	from /Users/uehli/Projects/daemons-proj/examples/run/myserver_crashing.rb:6:in `loop'
-	from /Users/uehli/Projects/daemons-proj/examples/run/myserver_crashing.rb:6
-	from /Users/uehli/Projects/daemons-proj/lib/daemons/application.rb:176:in `load'
-	from /Users/uehli/Projects/daemons-proj/lib/daemons/application.rb:176:in `start_load'
-	from /Users/uehli/Projects/daemons-proj/lib/daemons/application.rb:257:in `start'
-	from /Users/uehli/Projects/daemons-proj/lib/daemons/controller.rb:69:in `run'
-	from /Users/uehli/Projects/daemons-proj/lib/daemons.rb:139:in `run'
-	from /Users/uehli/Projects/daemons-proj/lib/daemons/cmdline.rb:105:in `call'
-	from /Users/uehli/Projects/daemons-proj/lib/daemons/cmdline.rb:105:in `catch_exceptions'
-	from /Users/uehli/Projects/daemons-proj/lib/daemons.rb:138:in `run'
-	from ctrl_crash.rb:17