fire_and_forget 0.3.2 → 0.3.3

data/Gemfile

@@ -1,7 +1,5 @@
 source "http://rubygems.org"
 
-gem "daemons", "~>1.1.0"
-
 group :development do
   gem "shoulda", ">= 0"
   gem 'jnunemaker-matchy', '~>0.4'

data/Gemfile.lock

@@ -1,7 +1,6 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    daemons (1.1.0)
     git (1.2.5)
     jeweler (1.5.1)
       bundler (~> 1.0.0)
@@ -17,7 +16,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  daemons (~> 1.1.0)
   jeweler (~> 1.5.1)
   jnunemaker-matchy (~> 0.4)
   rr (~> 1.0.2)

data/bin/fire_forget

@@ -6,10 +6,6 @@ Dir.chdir(File.join(File.dirname(__FILE__), '..'))
 faf_lib_path = File.expand_path(File.dirname(__FILE__) + "/../lib")
 $:.unshift(faf_lib_path) unless $:.include?(faf_lib_path)
 
-# include dependencies without using rubygems (to save memory)
-$:.unshift('vendor/daemons-1.1.0/lib')
-
-require 'vendor/daemons-1.1.0/lib/daemons'
 
 require 'ostruct'
 require 'optparse'

data/fire_and_forget.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fire_and_forget}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Garry Hill"]
-  s.date = %q{2011-01-21}
+  s.date = %q{2011-01-28}
   s.default_executable = %q{fire_forget}
   s.email = %q{garry@magnetised.info}
   s.executables = ["fire_forget"]
@@ -45,26 +45,7 @@ Gem::Specification.new do |s|
     "lib/fire_and_forget/utilities.rb",
     "lib/fire_and_forget/version.rb",
     "test/helper.rb",
-    "test/test_fire_and_forget.rb",
-    "vendor/daemons-1.1.0/LICENSE",
-    "vendor/daemons-1.1.0/README",
-    "vendor/daemons-1.1.0/Rakefile",
-    "vendor/daemons-1.1.0/Releases",
-    "vendor/daemons-1.1.0/TODO",
-    "vendor/daemons-1.1.0/lib/daemons.rb",
-    "vendor/daemons-1.1.0/lib/daemons/application.rb",
-    "vendor/daemons-1.1.0/lib/daemons/application_group.rb",
-    "vendor/daemons-1.1.0/lib/daemons/change_privilege.rb",
-    "vendor/daemons-1.1.0/lib/daemons/cmdline.rb",
-    "vendor/daemons-1.1.0/lib/daemons/controller.rb",
-    "vendor/daemons-1.1.0/lib/daemons/daemonize.rb",
-    "vendor/daemons-1.1.0/lib/daemons/etc_extension.rb",
-    "vendor/daemons-1.1.0/lib/daemons/exceptions.rb",
-    "vendor/daemons-1.1.0/lib/daemons/monitor.rb",
-    "vendor/daemons-1.1.0/lib/daemons/pid.rb",
-    "vendor/daemons-1.1.0/lib/daemons/pidfile.rb",
-    "vendor/daemons-1.1.0/lib/daemons/pidmem.rb",
-    "vendor/daemons-1.1.0/setup.rb"
+    "test/test_fire_and_forget.rb"
   ]
   s.homepage = %q{http://github.com/magnetised/fire_and_forget}
   s.licenses = ["MIT"]
@@ -81,14 +62,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<daemons>, ["~> 1.1.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["~> 0.4"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rr>, ["~> 1.0.2"])
     else
-      s.add_dependency(%q<daemons>, ["~> 1.1.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<jnunemaker-matchy>, ["~> 0.4"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -96,7 +75,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rr>, ["~> 1.0.2"])
     end
   else
-    s.add_dependency(%q<daemons>, ["~> 1.1.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<jnunemaker-matchy>, ["~> 0.4"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/fire_and_forget/command.rb

@@ -44,7 +44,7 @@ module FireAndForget
       end
 
       def debug()
-        "#{self.class.name.split("::").last} #{@task_name}\n"
+        "#{self.class.name.split("::").last} :#{@task_name}\n"
       end
     end
 

data/lib/fire_and_forget/command/fire.rb

@@ -1,5 +1,4 @@
 
-require 'daemons' unless defined?(Daemons)
 
 module FireAndForget
   module Command
@@ -54,11 +53,12 @@ module FireAndForget
           pid = fork do
             # set up the environment so that the task can access the F&F server
             env.each { | k, v | ENV[k] = v }
-            Daemons.daemonize(:backtrace => true)
+            # TODO: figure out how to pass a logfile path to this
+            daemonize
             Process.setpriority(Process::PRIO_PROCESS, 0, niceness) if niceness > 0
             # change to the UID of the originating thread if necessary
             Process::UID.change_privilege(task_uid) unless Process.euid == task_uid
-            File.umask(022)
+            File.umask(0022)
             exec(cmd)
           end
           Process.detach(pid) if pid
@@ -71,6 +71,80 @@ module FireAndForget
       def debug
         "Fire :#{@task.name}: #{cmd}\n"
       end
+
+      private
+
+      # The following adapted from Daemons.daemonize
+      def daemonize(logfile_name = nil, app_name = nil)
+        srand # Split rand streams between spawning and daemonized process
+          safefork and exit # Fork and exit from the parent
+
+        # Detach from the controlling terminal
+        unless sess_id = Process.setsid
+          raise RuntimeException.new('cannot detach from controlling terminal')
+        end
+
+        # Prevent the possibility of acquiring a controlling terminal
+        trap 'SIGHUP', 'IGNORE'
+        exit if pid = safefork
+
+        $0 = app_name if app_name
+
+        Dir.chdir "/"   # Release old working directory
+        File.umask 0000 # Ensure sensible umask
+
+        # Make sure all file descriptors are closed
+        ObjectSpace.each_object(IO) do |io|
+          unless [STDIN, STDOUT, STDERR].include?(io)
+            begin
+              unless io.closed?
+                io.close
+              end
+            rescue ::Exception
+            end
+          end
+        end
+
+        redirect_io(logfile_name)
+
+        return sess_id
+      end
+
+      def redirect_io(logfile_name)
+        begin; STDIN.reopen "/dev/null"; rescue ::Exception; end
+
+        if logfile_name
+          begin
+            STDOUT.reopen logfile_name, "a"
+            File.chmod(0644, logfile_name)
+            STDOUT.sync = true
+          rescue ::Exception
+            begin; STDOUT.reopen "/dev/null"; rescue ::Exception; end
+          end
+        else
+          begin; STDOUT.reopen "/dev/null"; rescue ::Exception; end
+        end
+
+        begin; STDERR.reopen STDOUT; rescue ::Exception; end
+        STDERR.sync = true
+      end
+
+      def safefork
+        tryagain = true
+
+        while tryagain
+          tryagain = false
+          begin
+            if pid = fork
+              return pid
+            end
+          rescue Errno::EWOULDBLOCK
+            sleep 5
+            tryagain = true
+          end
+        end
+      end
+
     end
   end
 end

data/lib/fire_and_forget/command/set_pid.rb

@@ -11,6 +11,10 @@ module FireAndForget
       def run
         FireAndForget::Server.pids[@task_name] = @pid
       end
+
+      def debug
+        "SetPid :#{@task_name}: #{@pid}\n"
+      end
     end
   end
 end

data/lib/fire_and_forget/command/set_status.rb

@@ -11,6 +11,10 @@ module FireAndForget
         FireAndForget::Server.set_pid(@task_name, @pid)
         FireAndForget::Server.status[@task_name] = @status_value.to_s
       end
+
+      def debug
+        "SetStatus :#{@task_name}: #{@status_value}\n"
+      end
     end
   end
 end

data/lib/fire_and_forget/server.rb

@@ -3,12 +3,12 @@ module FireAndForget
   class Server
     def self.parse(command_string)
       command = Command.load(command_string)
-      run(command)
+      [command, run(command)]
     end
 
     def self.run(cmd)
       if Command.allowed?(cmd)
-        [cmd, cmd.run]
+        cmd.run
       else
         raise PermissionsError, "'#{cmd.class}' is not an approved command"
       end

data/lib/fire_and_forget/version.rb

@@ -1,4 +1,4 @@
 
 module FireAndForget
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/test_fire_and_forget.rb

@@ -154,7 +154,7 @@ class TestFireAndForget < Test::Unit::TestCase
       mock(FAF::Command).load(is_a(String)) { command }
       mock(command).run { "666" }
       result = FAF::Server.parse("object")
-      result.should == "666"
+      result.should == [command, "666"]
     end
   end
   context "daemon methods" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Garry Hill
@@ -14,25 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +00:00
+date: 2011-01-28 00:00:00 +00:00
 default_executable: fire_forget
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  name: daemons
-  requirement: *id001
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -40,11 +26,11 @@ dependencies:
         - 0
         version: "0"
   name: shoulda
-  requirement: *id002
+  requirement: *id001
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -53,11 +39,11 @@ dependencies:
         - 4
         version: "0.4"
   name: jnunemaker-matchy
-  requirement: *id003
+  requirement: *id002
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -67,11 +53,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  requirement: *id004
+  requirement: *id003
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -81,11 +67,11 @@ dependencies:
         - 1
         version: 1.5.1
   name: jeweler
-  requirement: *id005
+  requirement: *id004
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -95,7 +81,7 @@ dependencies:
         - 2
         version: 1.0.2
   name: rr
-  requirement: *id006
+  requirement: *id005
   prerelease: false
   type: :development
 description: 
@@ -136,25 +122,6 @@ files:
 - lib/fire_and_forget/version.rb
 - test/helper.rb
 - test/test_fire_and_forget.rb
-- vendor/daemons-1.1.0/LICENSE
-- vendor/daemons-1.1.0/README
-- vendor/daemons-1.1.0/Rakefile
-- vendor/daemons-1.1.0/Releases
-- vendor/daemons-1.1.0/TODO
-- vendor/daemons-1.1.0/lib/daemons.rb
-- vendor/daemons-1.1.0/lib/daemons/application.rb
-- vendor/daemons-1.1.0/lib/daemons/application_group.rb
-- vendor/daemons-1.1.0/lib/daemons/change_privilege.rb
-- vendor/daemons-1.1.0/lib/daemons/cmdline.rb
-- vendor/daemons-1.1.0/lib/daemons/controller.rb
-- vendor/daemons-1.1.0/lib/daemons/daemonize.rb
-- vendor/daemons-1.1.0/lib/daemons/etc_extension.rb
-- vendor/daemons-1.1.0/lib/daemons/exceptions.rb
-- vendor/daemons-1.1.0/lib/daemons/monitor.rb
-- vendor/daemons-1.1.0/lib/daemons/pid.rb
-- vendor/daemons-1.1.0/lib/daemons/pidfile.rb
-- vendor/daemons-1.1.0/lib/daemons/pidmem.rb
-- vendor/daemons-1.1.0/setup.rb
 has_rdoc: true
 homepage: http://github.com/magnetised/fire_and_forget
 licenses: 

data/vendor/daemons-1.1.0/LICENSE

@@ -1,29 +0,0 @@
-Copyright (c) 2005-2007 Thomas Uehlinger
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-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/vendor/daemons-1.1.0/README

@@ -1,224 +0,0 @@
-= Daemons Version 1.1.0
-
-(See Releases for release-specific information)
-
-== What is Daemons?
-
-Daemons provides an easy way to wrap existing ruby scripts (for example a self-written server) 
-to be <i>run as a daemon</i> and to be <i>controlled by simple start/stop/restart commands</i>.
-
-If you want, you can also use daemons to <i>run blocks of ruby code in a daemon process</i> and to control
-these processes from the main application.
-
-Besides this basic functionality, daemons offers many advanced features like <i>exception backtracing</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 different ways:
-
-=== 1. Create wrapper scripts for your server scripts or applications
-
-Layout: suppose you have your self-written server <tt>myserver.rb</tt>:
-
-  # this is myserver.rb
-  # it does nothing really useful at the moment
-  
-  loop do
-    sleep(5)
-  end
-  
-To use <tt>myserver.rb</tt> in a production environment, you need to be able to
-run <tt>myserver.rb</tt> in the _background_ (this means detach it from the console, fork it
-in the background, release all directories and file descriptors).
-
-Just create <tt>myserver_control.rb</tt> like this:
-
-  # this is myserver_control.rb
-  
-  require 'rubygems'        # if you use RubyGems
-  require 'daemons'
-  
-  Daemons.run('myserver.rb')
-  
-And use it like this from the console:
-
-  $ ruby myserver_control.rb start
-      (myserver.rb is now running in the background)
-  $ ruby myserver_control.rb restart
-      (...)
-  $ ruby myserver_control.rb stop
-  
-For testing purposes you can even run <tt>myserver.rb</tt> <i>without forking</i> in the background:
-
-  $ ruby myserver_control.rb run
-
-An additional nice feature of Daemons is that you can pass <i>additional arguments</i> to the script that 
-should be daemonized by seperating them by two _hyphens_:
-  
-  $ ruby myserver_control.rb start -- --file=anyfile --a_switch another_argument
-  
-
-=== 2. Create wrapper scripts that include your server procs
-
-Layout: suppose you have some code you want to run in the background and control that background process
-from a script:
-
-  # this is your code
-  # it does nothing really useful at the moment
-  
-  loop do
-    sleep(5)
-  end
-  
-To run this code as a daemon create <tt>myproc_control.rb</tt> like this and include your code:
-
-  # this is myproc_control.rb
-  
-  require 'rubygems'        # if you use RubyGems
-  require 'daemons'
-  
-  Daemons.run_proc('myproc.rb') do
-    loop do
-      sleep(5)
-    end
-  end
-  
-And use it like this from the console:
-
-  $ ruby myproc_control.rb start
-      (myproc.rb is now running in the background)
-  $ ruby myproc_control.rb restart
-      (...)
-  $ ruby myproc_control.rb stop
-  
-For testing purposes you can even run <tt>myproc.rb</tt> <i>without forking</i> in the background:
-
-  $ ruby myproc_control.rb run
-  
-=== 3. Control a bunch of daemons from another application
-
-Layout: you have an application <tt>my_app.rb</tt> that wants to run a bunch of 
-server tasks as daemon processes.
-
-  # this is my_app.rb
-  
-  require 'rubygems'        # if you use RubyGems
-  require 'daemons'
-  
-  task1 = Daemons.call(:multiple => true) do
-    # first server task
-    
-    loop {
-      conn = accept_conn()
-      serve(conn)
-    }
-  end
-  
-  task2 = Daemons.call do
-    # second server task
-    
-    loop {
-      something_different()
-    }
-  end
-  
-  # the parent process continues to run
-  
-  # we can even control our tasks, for example stop them
-  task1.stop
-  task2.stop
-  
-  exit
-  
-=== 4. Daemonize the currently running process
-
-Layout: you have an application <tt>my_daemon.rb</tt> that wants to run as a daemon
-(but without the ability to be controlled by daemons via start/stop commands)
-
-  # this is my_daemons.rb
-  
-  require 'rubygems'        # if you use RubyGems
-  require 'daemons'
-  
-  # Initialize the app while we're not a daemon
-  init()
-  
-  # Become a daemon
-  Daemons.daemonize
-  
-  # The server loop
-  loop {
-    conn = accept_conn()
-    serve(conn)
-  }
-
-  
-<b>For further documentation, refer to the module documentation of Daemons.</b>
-
-  
-== Download and Installation
-
-*Download*: just go to http://rubyforge.org/projects/daemons/
-
-Installation *with* RubyGems:
-  $ su
-  # gem install daemons
-  
-Installation *without* RubyGems:
-  $ tar xfz daemons-x.x.x.tar.gz
-  $ cd daemons-x.x.x
-  $ su
-  # ruby setup.rb
-  
-== Documentation
-
-For further documentation, refer to the module documentation of Daemons (click on Daemons).
-
-The RDoc documentation is also online at http://daemons.rubyforge.org
-
-
-== Author
-
-Written 2005-2010 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-2010 Thomas Uehlinger
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-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.
-
-== Feedback and other resources
-
-At http://rubyforge.org/projects/daemons.