tootsie 0.9.3 → 0.9.4

data/README.md

@@ -180,7 +180,6 @@ Example S3 URLs:
 Current limitations
 ===================
 
-* Daemon supports only one task manager thread at a time.
 * Transcoding options are very basic.
 * No client access control; anyone can submit jobs.
 
@@ -216,8 +215,11 @@ Create a configuration, eg. `tootsie.conf`:
       aws_access_key_id: <your Amazon key>
       aws_secret_access_key: <your Amazon secret>
       sqs_queue_name: tootsie
+      pid_path: <where to write pid file>
+      log_path: <where to write log file>
+      worker_count: <number of workers>
 
-Start the task manager with `tootsie -c tootsie.conf start`. This will start Tootsie as a daemon.
+Start the task manager with `tootsie -c tootsie.conf`.
 
 To run the web service, you will need a Rack-compatible web server, such as Unicorn or Thin. To start with Thin on port 9090:
 

data/bin/tootsie

@@ -3,72 +3,4 @@
 $:.unshift(File.expand_path('../../lib', __FILE__))
 require 'tootsie'
 
-num_workers = 4
-config_path = nil
-log_target = 'syslog'
-
-ARGV.options do |opts|
-  opts.banner = "Usage: #{File.basename($0)} [OPTIONS] [start | stop | restart | status]"
-  opts.separator ""
-  opts.on("-n", "--num-workers=WORKERS", Integer,
-    "Specify number of workers to fork (defaults to #{num_workers}.") do |value|
-    num_workers = [1, value.to_i].max
-  end
-  opts.on("-c", "--config=PATH", String,
-    "Specify configuration path.") do |value|
-    config_path = value
-  end
-  opts.on("-l TARGET", "--logger TARGET", String,
-    "Log to TARGET, which is either a file name or 'syslog'.") do |value|
-    log_target = value
-  end
-  opts.on("-h", "--help", "Show this help message.") do
-    puts opts
-    exit
-  end
-  opts.parse!
-  if ARGV.empty?
-    puts "Nothing to do. Run with -h for help."
-    exit
-  end
-end
-
-unless config_path
-  abort 'Configuration file not specified.'
-end
-config_path = File.expand_path(config_path)
-
-case log_target
-  when 'syslog'
-    logger = SyslogLogger.new('tootsie')
-  else
-    logger = Logger.new(log_target)
-end
-
-controller = Tootsie::Daemon.new(
-  :root => File.join(File.dirname(__FILE__), "/.."),
-  :pid_file => File.join(File.dirname(__FILE__), "/../tmp/task_manager.pid"),
-  :logger => logger)
-
-spawner = Spawner.new(:num_children => num_workers, :logger => controller.logger)
-
-controller.on_spawn do
-  $0 = "tootsie: master"
-  spawner.on_spawn do
-    $0 = "tootsie: worker"
-    Signal.trap('TERM') do
-      exit(2)
-    end
-    app = Tootsie::Application.new(:logger => controller.logger)
-    app.configure!(config_path)
-    begin
-      app.task_manager.run!
-    rescue SystemExit, Interrupt
-    end
-  end
-  spawner.run
-end
-controller.on_terminate do
-  spawner.terminate
-end
-controller.control(ARGV)
+Tootsie::Runner.new.run!(ARGV)

data/lib/tootsie.rb

@@ -8,7 +8,6 @@ require 'tootsie/application'
 require 'tootsie/client'
 require 'tootsie/configuration'
 require 'tootsie/command_runner'
-require 'tootsie/daemon'
 require 'tootsie/spawner'
 require 'tootsie/ffmpeg_adapter'
 require 'tootsie/image_metadata_extractor'
@@ -23,3 +22,4 @@ require 'tootsie/processors/image_processor'
 require 'tootsie/queues/sqs_queue'
 require 'tootsie/queues/file_system_queue'
 require 'tootsie/s3_utilities'
+require 'tootsie/runner'

data/lib/tootsie/application.rb

@@ -4,12 +4,19 @@ module Tootsie
     
     def initialize(options = {})
       @@instance = self
-      @logger = options[:logger] || Logger.new($stderr)
       @configuration = Configuration.new
     end
     
     def configure!(config_path)
       @configuration.load_from_file(config_path)
+      case @configuration.log_path
+        when 'syslog'
+          @logger = SyslogLogger.new('tootsie')
+        when String
+          @logger = Logger.new(@configuration.log_path)
+        else
+          @logger = Logger.new($stderr)
+      end
       @queue = Tootsie::SqsQueue.new(@configuration.sqs_queue_name, sqs_service)
       @task_manager = TaskManager.new(@queue)
     end

data/lib/tootsie/configuration.rb

@@ -4,13 +4,14 @@ module Tootsie
     
     def initialize
       @ffmpeg_thread_count = 1
+      @worker_count = 4
       @sqs_queue_name = 'tootsie'
     end
     
     def load_from_file(file_name)
       config = (YAML.load(File.read(file_name)) || {}).with_indifferent_access
       [:aws_access_key_id, :aws_secret_access_key, :ffmpeg_thread_count,
-        :sqs_queue_name].each do |key|
+        :sqs_queue_name, :worker_count, :pid_path, :log_path].each do |key|
         if config.include?(key)
           value = config[key]
           value = $1.to_i if value =~ /\A\s*(\d+)\s*\z/
@@ -23,6 +24,9 @@ module Tootsie
     attr_accessor :aws_secret_access_key
     attr_accessor :ffmpeg_thread_count
     attr_accessor :sqs_queue_name
+    attr_accessor :pid_path
+    attr_accessor :log_path
+    attr_accessor :worker_count
     
   end
   

data/lib/tootsie/runner.rb

@@ -0,0 +1,118 @@
+module Tootsie
+
+  # Runs the daemon from the command line.
+  class Runner
+
+    def initialize
+      @run_as_daemon = false
+      @config_path = '/etc/tootsie/tootsie.conf'
+      @app = Application.new
+    end
+
+    def run!(arguments = [])
+      OptionParser.new do |opts|
+        opts.banner = "Usage: #{File.basename($0)} [OPTIONS]"
+        opts.separator ""
+        opts.on("-d", "--daemon", 'Run as daemon') do
+          @run_as_daemon = true
+        end
+        opts.on("-p PATH", "--pid", "Store pid in PATH (defaults to #{@pid_path})") do |value|
+          @pid_path = File.expand_path(value)
+        end
+        opts.on("-c FILE", "--config FILE", "Read configuration from FILE (defaults to #{@config_path})") do |value|
+          @config_path = File.expand_path(value)
+        end
+        opts.on("-h", "--help", "Show this help.") do
+          puts opts
+          exit
+        end
+        opts.parse!(arguments)
+      end
+
+      @app.configure!(@config_path)
+
+      if @run_as_daemon
+        daemonize!
+      else
+        execute!
+      end
+    end
+
+    private
+
+      def execute!
+        with_pid do
+          @spawner = Spawner.new(
+            :num_children => @app.configuration.worker_count,
+            :logger => logger)
+          @spawner.on_spawn do
+            $0 = "tootsie: worker"
+            Signal.trap('TERM') do
+              exit(2)
+            end
+            with_lifecycle_logging("Worker [#{Process.pid}]") do
+              @app.task_manager.run!
+            end
+          end
+          with_lifecycle_logging('Main process') do
+            @spawner.run
+          end
+          @spawner.terminate
+        end
+      end
+
+      def daemonize!(&block)
+        return Process.fork {
+          logger = @app.logger
+
+          Process.setsid
+          0.upto(255) do |n|
+            File.for_fd(n, "r").close rescue nil
+          end
+
+          File.umask(27)
+          Dir.chdir('/')
+          $stdin.reopen("/dev/null", 'r')
+          $stdout.reopen("/dev/null", 'w')
+          $stderr.reopen("/dev/null", 'w')
+
+          Signal.trap("HUP") do
+            logger.debug("Ignoring SIGHUP")
+          end
+
+          execute!
+        }
+      end
+
+      def with_pid(&block)
+        path = @pid_path
+        path ||= @app.configuration.pid_path
+        path ||= '/var/run/tootsie.pid'
+
+        File.open(path, 'w') do |file|
+          file << Process.pid
+        end
+        begin
+          yield
+        ensure
+          File.delete(path) rescue nil
+        end
+      end
+
+      def with_lifecycle_logging(prefix, &block)
+        logger.info("#{prefix} starting")
+        yield
+      rescue SystemExit, Interrupt, SignalException
+        logger.info("#{prefix} signaled")
+      rescue Exception => e
+        logger.error("#{prefix} failed with exception #{e.class}: #{e}")
+        exit(1)
+      end
+
+      def logger
+        @app.logger
+      end
+
+  end
+
+end

data/lib/tootsie/version.rb

@@ -1,3 +1,3 @@
 module Tootsie
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

metadata

@@ -1,266 +1,189 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tootsie
-version: !ruby/object:Gem::Version 
-  hash: 61
+version: !ruby/object:Gem::Version
+  version: 0.9.4
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 3
-  version: 0.9.3
 platform: ruby
-authors: 
+authors:
 - Alexander Staubo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-20 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70337010813360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
+      - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010813360
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70337010812840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010812840
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70337010812360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: httpclient
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010812360
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: &70337010811880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 2
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.2.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010811880
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70337010811400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010811400
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &70337010810920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 1
-        - 16
-        version: "1.16"
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: xml-simple
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010810920
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: &70337010810440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        - 12
+      - !ruby/object:Gem::Version
         version: 1.0.12
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010810440
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70337010809960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 2
-        - 7
+      - !ruby/object:Gem::Version
         version: 1.2.7
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: s3
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010809960
+- !ruby/object:Gem::Dependency
+  name: s3
+  requirement: &70337010809480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 3
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.3.7
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: sqs
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010809480
+- !ruby/object:Gem::Dependency
+  name: sqs
+  requirement: &70337010809000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: unicorn
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010809000
+- !ruby/object:Gem::Dependency
+  name: unicorn
+  requirement: &70337010808520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 4
-        - 1
-        - 1
+      - !ruby/object:Gem::Version
         version: 4.1.1
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010808520
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70337010808040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.2
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: scashin133-syslog_logger
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010808040
+- !ruby/object:Gem::Dependency
+  name: scashin133-syslog_logger
+  requirement: &70337010807560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 7
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.7.3
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010807560
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70337010807180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *70337010807180
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70337010806720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id015
+  prerelease: false
+  version_requirements: *70337010806720
 description: Tootsie is a simple audio/video/image transcoding/modification application.
-email: 
+email:
 - alex@origo.no
-executables: 
+executables:
 - tootsie
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - License
@@ -269,13 +192,11 @@ files:
 - Tootsie.gemspec
 - bin/tootsie
 - config.ru
-- config/development-sample.yml
 - lib/tootsie.rb
 - lib/tootsie/application.rb
 - lib/tootsie/client.rb
 - lib/tootsie/command_runner.rb
 - lib/tootsie/configuration.rb
-- lib/tootsie/daemon.rb
 - lib/tootsie/ffmpeg_adapter.rb
 - lib/tootsie/image_metadata_extractor.rb
 - lib/tootsie/input.rb
@@ -284,6 +205,7 @@ files:
 - lib/tootsie/processors/video_processor.rb
 - lib/tootsie/queues/file_system_queue.rb
 - lib/tootsie/queues/sqs_queue.rb
+- lib/tootsie/runner.rb
 - lib/tootsie/s3_utilities.rb
 - lib/tootsie/spawner.rb
 - lib/tootsie/task_manager.rb
@@ -298,38 +220,29 @@ files:
 - spec/tootsie/s3_utilities_spec.rb
 homepage: http://github.com/alexstaubo/tootsie
 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: tootsie
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Tootsie is a simple audio/video/image transcoding/modification application.
-test_files: 
+test_files:
 - spec/spec_helper.rb
 - spec/test_files/BF 0622 1820.tif
 - spec/tootsie/command_runner_spec.rb

data/config/development-sample.yml

@@ -1,4 +0,0 @@
----
-  aws_access_key_id: <your_key>
-  aws_secret_access_key: <your_secret>
-  sqs_queue_name: tootsie

data/lib/tootsie/daemon.rb

@@ -1,282 +0,0 @@
-require "logger"
-require "fileutils"
-require 'optparse'
-
-module Tootsie
-
-  class DaemonError < Exception; end
-  class DaemonAlreadyRunning < DaemonError; end
-  class DaemonNotRunning < DaemonError; end
-  class DaemonTerminationFailed < DaemonError; end
-  class DaemonNotConfigured < DaemonError; end
-  class DaemonStartFailed < DaemonError; end 
-
-  # Daemon controller class that encapsulates a running daemon and a remote interface to it.
-  class Daemon
-  
-    # Initializes the daemon controller.
-    def initialize(options = {})
-      @root = options[:root] || Dir.pwd
-      @pid_file = options[:pid_file]
-      @logger = options[:logger] || Logger.new('/dev/null')
-      @on_spawn = nil
-    end
-
-    # Specifies a block to execute to run the actual daemon. Each call overrides the previous one.  
-    def on_spawn(&block)
-      @on_spawn = block
-    end
-
-    # Specifies a block to execute to termiantion. Each call overrides the previous one.  
-    def on_terminate(&block)
-      @on_terminate = block
-    end
-  
-    # Control the daemon through command-line arguments.
-    def control(args, title = nil)
-      $stderr.sync = true
-      title ||= File.basename($0)
-      command = args.shift
-      control_with_command(command, args, title)
-    end
-  
-    # Control the daemon through a specific command.
-    def control_with_command(command, args, title = nil)
-      case command
-        when "start"
-          $stderr << "Starting #{title}: "
-          handle_errors do
-            start
-            $stderr << "started\n"
-          end
-        when "stop"
-          $stderr << "Stopping #{title}: "
-          options = {}
-          handle_errors do
-            stop({:signal => "TERM"}.merge(options))
-            $stderr << "stopped\n"
-          end
-        when "restart"
-          $stderr << "Restarting #{title}: "
-          handle_errors do
-            restart
-            $stderr << "restarted\n"
-          end
-        when "status"
-          if running?
-            $stderr << "#{title} is running\n"
-          else
-            $stderr << "#{title} is not running\n"
-          end
-      else
-        if command
-          $stderr << "#{File.basename($0)}: Invalid command #{command}\n"
-        else
-          puts "Usage: #{File.basename($0)} [start | stop | restart | status]"
-        end
-      end
-    end
-  
-    # Starts daemon.
-    def start
-      raise DaemonNotConfigured, "Daemon not configured" unless @on_spawn
-      FileUtils.mkdir_p(File.dirname(@pid_file)) rescue nil
-      pid = self.pid
-      if pid
-        if pid_running?(pid)
-          raise DaemonAlreadyRunning, "Process is already running with pid #{pid}"
-        end
-      end
-      File.delete(@pid_file) rescue nil
-      child_pid = Process.fork
-      if child_pid
-        sleep(1)      
-        unless running?
-          pid = self.pid
-          if pid == child_pid
-            raise DaemonStartFailed, "Daemon started, but failed prematurely"
-          else
-            raise DaemonStartFailed, "Daemon failed to start for some unknown reason"
-          end
-        end      
-        return
-      end
-      class << logger
-        def format_message(severity, timestamp, progname, msg)
-          "[#{timestamp}] #{msg}\n"
-        end
-      end
-      logger.info("Starting")
-      begin
-        Process.setsid
-        0.upto(255) do |n|
-          File.for_fd(n, "r").close rescue nil
-        end
-        File.umask(27)
-        Dir.chdir(@root)
-        $stdin = File.open("/dev/null", File::RDWR)
-        $stdout = File.open("/dev/null", File::RDWR)
-        $stderr = File.open("/dev/null", File::RDWR)
-        @pid = Process.pid
-        File.open(@pid_file, "w") do |file|
-          file << Process.pid
-        end
-        Signal.trap("HUP") do
-          logger.debug("Ignoring SIGHUP")
-        end
-        Signal.trap("TERM") do
-          if $$ == @pid
-            logger.info("Terminating (#{$$})")
-            @on_terminate.call if @on_terminate
-            File.delete(@pid_file) rescue nil
-          else
-            # Was sent to a child
-          end
-          exit(0)
-        end
-        @on_spawn.call
-        exit(0)
-      rescue SystemExit
-        # Do nothing
-      rescue Exception => e
-        message = "#{e.message}\n"
-        message << e.backtrace.map { |line| "\tfrom #{line}\n" }.join
-        logger.error(message)
-        exit(1)
-      ensure
-        logger.close
-      end
-    end
-  
-    # Stops daemon.
-    def stop(options = {})
-      stopped = false
-      found = false
-      pid = self.pid
-      if pid
-        # Send TERM to process
-        begin
-          Process.kill(options[:signal] || "TERM", pid)
-        rescue Errno::ESRCH
-          stopped = true
-        rescue Exception => e
-          raise DaemonTerminationFailed, "Could not stop process #{pid}: #{e.message}"
-        end
-        unless stopped
-          # Process was signaled, now wait for it to die
-          found = true
-          30.times do
-            begin
-              if not pid_running?(pid)
-                stopped = true
-                break
-              end
-              sleep(1)
-            rescue Exception => e
-              raise DaemonTerminationFailed, "Could not stop process #{pid}: #{e.message}"
-            end
-          end
-          if found and not stopped
-            # Process still running after wait, force kill and wait
-            begin
-              Process.kill("KILL", pid)
-            rescue Errno::ESRCH
-              stopped = true
-            end
-            30.times do
-              begin
-                if not pid_running?(pid)
-                  stopped = true
-                  break
-                end
-                sleep(1)
-              rescue Exception => e
-                raise DaemonTerminationFailed, "Could not stop process #{pid}: #{e.message}"
-              end
-            end
-            if not stopped
-              raise DaemonTerminationFailed, "Timeout attempting to stop process #{pid}"
-            end
-          end
-        end
-      end
-      unless found
-        raise DaemonNotRunning, "Process is not running"
-      end
-    end
-  
-    # Restarts daemon.
-    def restart
-      if running?
-        begin
-          stop
-        rescue DaemonNotRunning
-          # Ignore
-        end
-      end
-      start
-    end
-  
-    # Is the daemon running?
-    def running?
-      !pid.nil?
-    end
-  
-    # Returns the daemon pid.
-    def pid
-      pid = nil
-      maybe_pid = File.read(@pid_file) rescue nil
-      if maybe_pid =~ /([0-9]+)/
-        maybe_pid = $1.to_i
-        begin
-          Process.kill(0, maybe_pid)
-        rescue Errno::ESRCH
-        else
-          pid = maybe_pid
-        end
-      end
-      pid
-    end
-
-    # Signals the daemon.  
-    def signal(signal)
-      pid = self.pid
-      if pid
-        Process.kill(signal, pid)
-      else
-        raise DaemonNotRunning, "Process is not running"
-      end
-    end
-  
-    attr_reader :root
-    attr_reader :pid_file
-    attr_reader :logger
-  
-    private
-
-      def pid_running?(pid)
-        begin
-          Process.kill(0, pid)
-        rescue Errno::ESRCH
-          return false
-        end
-        return true
-      end
-        
-      def handle_errors(&block)
-        begin
-          yield
-        rescue DaemonError => e
-          $stderr << "#{e.message}\n"
-          if e.is_a?(DaemonAlreadyRunning) or e.is_a?(DaemonNotRunning)
-            exit_code = 0
-          else
-            exit_code = 1
-          end
-          exit(exit_code)
-        end
-      end
-
-  end
-
-end