daemon-kit 0.1.8.1 → 0.1.8.2

data/lib/daemon_kit/arguments.rb

@@ -57,7 +57,7 @@ module DaemonKit
       # #Configuration instance are listed below:
       #
       #   -e value or --env value => environment
-      #   --pid pidfile           => pid_file
+      #   --pidfile pidfile           => pid_file
       #   -l path or --log path   => /path/to/log/file
       #
       def configuration( argv )
@@ -83,7 +83,7 @@ module DaemonKit
             next
           end
 
-          if argv[i] == "--pidfile"
+          if argv[i] == "--pidfile" || argv[i] == "--pid"
             argv.delete_at( i )
             configs << "pid_file=#{argv.delete_at(i)}"
             next
@@ -147,7 +147,7 @@ module DaemonKit
 
         opts.separator "Common options:"
         opts.on("-v", "--version", "Show version information and exit") do
-          puts "daemon-kit #{DaemonKit::VERSION} (http://github.com/kennethkalmer/daemon-kit)"
+          puts "daemon-kit #{DaemonKit.version} (http://github.com/kennethkalmer/daemon-kit)"
           exit
         end
 

data/lib/daemon_kit/commands/console.rb

@@ -33,6 +33,6 @@ ENV['DAEMON_ENV'] = case ARGV.first
     ARGV.first || ENV['DAEMON_ENV'] || 'development'
 end
 
-puts "Loading #{ENV['DAEMON_ENV']} environment (daemon-kit #{DaemonKit::VERSION})"
+puts "Loading #{ENV['DAEMON_ENV']} environment (daemon-kit #{DaemonKit.version})"
 
 exec "#{options[:irb]} #{libs} --simple-prompt"

data/lib/daemon_kit/deployment/capistrano.rb

@@ -67,11 +67,6 @@ _cset(:run_method)        { fetch(:use_sudo, true) ? :sudo : :run }
 # standalone case, or during deployment.
 _cset(:latest_release) { exists?(:deploy_timestamped) ? release_path : current_release }
 
-# =========================================================================
-# Variables for bundler
-# =========================================================================
-_cset(:use_bundler, true)
-
 # =========================================================================
 # These are helper methods that will be available to your recipes.
 # =========================================================================
@@ -203,16 +198,12 @@ namespace :deploy do
     control software you are using (it defaults to :subversion), and the \
     :deploy_via variable to the strategy you want to use to deploy (it \
     defaults to :checkout).
-
-    Your bundles will also be installed/updated as part of this step. \
-    You can disable bundler on remote reployments with the :user_bundler \
     variable.
   DESC
   task :update_code, :except => { :no_release => true } do
     on_rollback { run "rm -rf #{release_path}; true" }
     strategy.deploy!
     finalize_update
-    bundler.bundle_new_release if fetch(:use_bundler, true)
   end
 
   desc <<-DESC
@@ -254,17 +245,18 @@ namespace :deploy do
   end
 
   desc <<-DESC
-    Copies any shared configuration files from :deploy_to/config into \
+    Symlinks any shared configuration files from :deploy_to/config into \
     the current release's config directory. Original files, if present, \
-    are renamed to the same name with .orig appended.
+    will be overwritten.
 
     Specify a list of files by setting :config_files to an array in your \
     deployment configuration.
   DESC
   task :copy_configs do
     fetch(:config_files, []).each do |f|
-      run "[ -f #{release_path}/config/#{f} ]; mv #{release_path}/config/#{f} #{release_path}/config/#{f}.orig"
-      run "[ -f #{deploy_to}/config/#{f} ]; cp #{deploy_to}/config/#{f} #{release_path}/config/#{f}"
+      master_config_file = "#{deploy_to}/config/#{f}"
+
+      run "if [ -f #{master_config_file} ]; then ln -nsf #{master_config_file} #{current_release}/config/#{f}; fi"
     end
   end
 
@@ -408,8 +400,6 @@ namespace :deploy do
   task :check, :except => { :no_release => true } do
     dependencies = strategy.check!
 
-    depend( :remote, :gem, "bundler", ">= 0.9.26" ) if fetch(:use_bundler, true)
-
     other = fetch(:dependencies, {})
     other.each do |location, types|
       types.each do |type, calls|
@@ -456,7 +446,7 @@ namespace :deploy do
     the :use_sudo variable to false.
   DESC
   task :start do
-    try_runner "/usr/bin/env DAEMON_ENV=#{fetch(:daemon_env)} #{current_path}/bin/#{application} start"
+    try_runner "DAEMON_ENV=#{fetch(:daemon_env)} BUNDLE_GEMFILE=#{current_path}/Gemfile bundle exec #{current_path}/bin/#{application} start"
   end
 
   desc <<-DESC
@@ -468,7 +458,7 @@ namespace :deploy do
     the :use_sudo variable to false.
   DESC
   task :stop do
-    try_runner "/usr/bin/env DAEMON_ENV=#{fetch(:daemon_env)} #{current_path}/bin/#{application} stop"
+    try_runner "DAEMON_ENV=#{fetch(:daemon_env)} BUNDLE_GEMFILE=#{current_path}/Gemfile bundle exec #{current_path}/bin/#{application} stop"
   end
 
   namespace :pending do
@@ -492,25 +482,3 @@ namespace :deploy do
     end
   end
 end
-
-namespace :bundler do
-  task :create_symlink, :roles => :app do
-    shared_dir = File.join(shared_path, 'bundle')
-    release_dir = File.join(current_release, '.bundle')
-    run("mkdir -p #{shared_dir} && ln -s #{shared_dir} #{release_dir}")
-  end
-
-  task :bundle_new_release, :roles => :app do
-    bundler.create_symlink
-    run "cd #{release_path} && bundle install .bundle --without test"
-  end
-
-  task :lock, :roles => :app do
-    run "cd #{current_release} && bundle lock;"
-  end
-
-  task :unlock, :roles => :app do
-    run "cd #{current_release} && bundle unlock;"
-  end
-end
-

data/lib/daemon_kit/dk_amqp.rb

@@ -1,5 +1,5 @@
 require 'yaml'
-require 'mq'
+require 'amqp'
 
 module DaemonKit
   # Thin wrapper around the amqp gem, specifically designed to ease

data/lib/daemon_kit/initializer.rb

@@ -8,6 +8,7 @@ $LOAD_PATH.unshift( File.expand_path('../', __FILE__).to_absolute_path ) unless
   $LOAD_PATH.include?( File.expand_path('../', __FILE__).to_absolute_path )
 
 require 'daemon_kit'
+require 'safely'
 
 module DaemonKit
 
@@ -74,7 +75,7 @@ module DaemonKit
         end
       end
 
-      log_exceptions if DaemonKit.configuration.backtraces && !clean
+      Safely::Backtrace.safe_shutdown! if DaemonKit.configuration.backtraces && clean
 
       DaemonKit.logger.warn "Shutting down #{DaemonKit.configuration.daemon_name}"
 
@@ -103,11 +104,11 @@ module DaemonKit
 
       include_core_lib
       load_postdaemonize_configs
-      configure_backtraces
+      configure_safely
 
       set_process_name
 
-      DaemonKit.logger.info( "DaemonKit (#{DaemonKit::VERSION}) booted, now running #{DaemonKit.configuration.daemon_name}" )
+      DaemonKit.logger.info( "DaemonKit (#{DaemonKit.version}) booted, now running #{DaemonKit.configuration.daemon_name}" )
 
       if DaemonKit.configuration.user || DaemonKit.configuration.group
         euid = Process.euid
@@ -173,7 +174,7 @@ module DaemonKit
 
       DaemonKit.logger = logger
 
-      DaemonKit.logger.info "DaemonKit (#{DaemonKit::VERSION}) booting in #{DAEMON_ENV} mode"
+      DaemonKit.logger.info "DaemonKit (#{DaemonKit.version}) booting in #{DAEMON_ENV} mode"
 
       configuration.trap("USR1") {
         DaemonKit.logger.level = DaemonKit.logger.debug? ? :info : :debug
@@ -202,38 +203,19 @@ module DaemonKit
       end
     end
 
-    def configure_backtraces
-      Thread.abort_on_exception = configuration.backtraces
+    def configure_safely
+      Thread.abort_on_exception = true
+
+      Safely::Strategy::Log.logger = DaemonKit.logger
+
+      Safely::Backtrace.trace_directory = File.join( DAEMON_ROOT, "log" )
+      Safely::Backtrace.enable!
     end
 
     def set_process_name
       $0 = configuration.daemon_name
     end
 
-    def self.log_exceptions
-      trace_file = File.join( DaemonKit.root, 'log', "backtrace-#{Time.now.strftime('%Y%m%d%H%M%S')}-#{Process.pid}.log" )
-      trace_log = Logger.new( trace_file )
-
-      # Find the last exception
-      e = nil
-      ObjectSpace.each_object {|o|
-        if ::Exception === o
-          e = o
-        end
-      }
-
-      trace_log.info "*** Below you'll find the most recent exception thrown, this will likely (but not certainly) be the exception that made #{DaemonKit.configuration.daemon_name} exit abnormally ***"
-      trace_log.error e
-
-      trace_log.info "*** Below you'll find all the exception objects in memory, some of them may have been thrown in your application, others may just be in memory because they are standard exceptions ***"
-      ObjectSpace.each_object {|o|
-        if ::Exception === o
-          trace_log.error o
-        end
-      }
-
-      trace_log.close
-    end
   end
 
   # Holds our various configuration values
@@ -268,8 +250,8 @@ module DaemonKit
     # Use the force kill patch? Give the number of seconds
     configurable :force_kill_wait
 
-    # Should be log backtraces
-    configurable :backtraces, false
+    # Should we log backtraces
+    configurable :backtraces, true
 
     # Configurable umask
     configurable :umask, 0022
@@ -283,9 +265,6 @@ module DaemonKit
     # Collection of signal traps
     attr_reader :signal_traps
 
-    # Our safety net (#Safety) instance
-    attr_accessor :safety_net
-
     # :nodoc: Shutdown hooks
     attr_reader :shutdown_hooks
 
@@ -301,8 +280,6 @@ module DaemonKit
 
       self.force_kill_wait = false
 
-      self.safety_net = DaemonKit::Safety.instance
-
       @signal_traps = {}
       @shutdown_hooks = []
     end

data/lib/daemon_kit/ruote_participants.rb

@@ -36,6 +36,7 @@ module DaemonKit
       @transports = []
       @participants = {}
       @runtime_queues = []
+      @amqp_reply_queue = 'ruote_workitems'
 
       @configuration = Config.load('ruote')
     end
@@ -54,6 +55,12 @@ module DaemonKit
       @transports << transport
     end
 
+    # Set the name of the AMQP queue that a remote RuoteAMQP::Receiver is listening
+    # to (defaults to 'ruote_workitems')
+    def amqp_reply_queue( name )
+      @amqp_reply_queue = name
+    end
+
     # Register classes as pseudo-participants. Two styles of registration are
     # supported:
     #
@@ -90,7 +97,7 @@ module DaemonKit
 
     def run_amqp!
       AMQP.run do
-        mq = ::MQ.new
+        mq = ::AMQP::Channel.new
         queues = @configuration['amqp']['queues'].to_a | @runtime_queues
 
         queues.each do |q|
@@ -101,7 +108,7 @@ module DaemonKit
             safely do
               DaemonKit.logger.debug("Received workitem: #{message.inspect}")
 
-              RuoteWorkitem.process( :amqp, message )
+              RuoteWorkitem.process( :amqp, @amqp_reply_queue, message )
 
               DaemonKit.logger.debug("Processed workitem.")
 

data/lib/daemon_kit/ruote_workitem.rb

@@ -36,7 +36,7 @@ module DaemonKit
       # the error information:
       #
       #   daemon_kit.error
-      def process( transport, workitem )
+      def process( transport, from, workitem )
         # keep it singleton
         @instance ||= new
 
@@ -64,7 +64,7 @@ module DaemonKit
           work["__error__"] = msg
         end
 
-        reply_to_engine( transport, work )
+        reply_to_engine( transport, from, work )
       end
 
       # Extract the class and method name from the workitem, then pick the matching
@@ -85,13 +85,13 @@ module DaemonKit
         return instance, method
       end
 
-      def reply_to_engine( transport, response )
-        send( "reply_via_#{transport}", response )
+      def reply_to_engine( transport, from, response )
+        send( "reply_via_#{transport}", from, response )
       end
 
-      def reply_via_amqp( response )
+      def reply_via_amqp( destination_queue, response )
         DaemonKit.logger.debug("Replying to engine via AMQP with #{response.inspect}")
-        ::MQ.queue( response['params']['reply_queue'] ).publish( response.to_json )
+        ::AMQP::Channel.new.queue( destination_queue, :durable => true ).publish( response.to_json )
 
         response
       end

data/lib/daemon_kit/version.rb

@@ -0,0 +1,6 @@
+module DaemonKit
+  def version
+    '0.1.8.2'
+  end
+  module_function :version
+end

data/lib/generators/daemon_kit/amqp/templates/config/pre-daemonize/amqp.rb

@@ -1,6 +1,5 @@
 begin
   require 'amqp'
-  require 'mq'
 rescue LoadError
   $stderr.puts "Missing amqp gem. Please run 'bundle install'."
   exit 1

data/lib/generators/daemon_kit/amqp/templates/libexec/%app_name%-daemon.rb

@@ -30,7 +30,7 @@ DaemonKit::AMQP.run do
   #   end
   # end
 
-  amq = ::MQ.new
+  amq = AMQP::Channel.new
   amq.queue('test').subscribe do |msg|
     DaemonKit.logger.debug "Received message: #{msg.inspect}"
   end

data/lib/generators/daemon_kit/app/templates/Gemfile

@@ -9,4 +9,9 @@ source :gemcutter
 # daemon-kit
 gem 'daemon-kit'
 
+# safely (http://github.com/kennethkalmer/safely)
+gem 'safely'
+# gem 'toadhopper' # For reporting exceptions to hoptoad
+# gem 'mail' # For reporting exceptions via mail
+
 # For more information on bundler, please visit http://gembundler.com

data/lib/generators/daemon_kit/app/templates/config/boot.rb

@@ -3,14 +3,8 @@
 
 DAEMON_ROOT = "#{File.expand_path(File.dirname(__FILE__))}/.." unless defined?( DAEMON_ROOT )
 
-# Use Bundler (preferred)
-begin
-  require File.expand_path('../../.bundle/environment', __FILE__)
-rescue LoadError
-  require 'rubygems'
-  require 'bundler'
-  Bundler.setup
-end
+require "rubygems"
+require "bundler/setup"
 
 module DaemonKit
   class << self

data/lib/generators/daemon_kit/app/templates/config/environment.rb.tt

@@ -19,8 +19,4 @@ DaemonKit::Initializer.run do |config|
 
   # Log backraces when a thread/daemon dies (Recommended)
   # config.backtraces = true
-
-  # Configure the safety net (see DaemonKit::Safety)
-  # config.safety_net.handler = :hoptoad
-  # config.safety_net.hoptoad.api_key = ''
 end

data/lib/generators/daemon_kit/app/templates/config/pre-daemonize/safely.rb

@@ -0,0 +1,13 @@
+# Safely is responsible for providing exception reporting and the
+# logging of backtraces when your daemon dies unexpectedly. The full
+# documentation for safely can be found at
+# http://github.com/kennethkalmer/safely/wiki
+
+# By default Safely will use the daemon-kit's logger to log exceptions,
+# and will store backtraces in the "log" directory.
+
+# Comment out to enable Hoptoad support
+# Safely::Strategy::Hoptoad.hoptoad_key = ""
+
+# Comment out to use email exceptions
+# Safely::Strategy::Mail.recipient = "your.name@gmail.com"

data/lib/generators/daemon_kit/capistrano/templates/config/deploy.rb.tt

@@ -23,9 +23,7 @@ set :git_enable_submodules, 1
 # No sudo
 set :use_sudo, false
 
-# File list in the config_files setting will be copied from the
-# 'deploy_to' directory into config, overwriting files from the repo
-# with the same name
+# See `cap -e deploy:copy_configs`
 set :config_files, %w{}
 
 # List any work directories here that you need persisted between
@@ -35,7 +33,7 @@ set :shared_children, %w{log tmp}
 
 # Record our dependencies
 unless File.directory?( "#{DaemonKit.root}/vendor/daemon_kit" )
-  depend :remote, :gem, "daemon-kit", ">=#{DaemonKit::VERSION}"
+  depend :remote, :gem, "daemon-kit", ">=#{DaemonKit.version}"
 end
 
 # Hook into capistrano's events
@@ -44,6 +42,9 @@ before "deploy:update_code", "deploy:check"
 # Setup log rotation support with every deploy (safe)
 #after 'deploy:symlink', 'deploy:logrotate'
 
+# Switch me off if you don't want Bundler integration
+require "bundler/capistrano"
+
 # Create some tasks related to deployment
 namespace :deploy do
 

data/lib/generators/daemon_kit/ruote/templates/config/pre-daemonize/ruote.rb

@@ -7,7 +7,6 @@ end
 
 begin
   require 'amqp'
-  require 'mq'
 rescue LoadError
   $stderr.puts "Missing amqp gem. Please uncomment the amqp section in the Gemfile and run 'bundle install' if you wish to use the AMQP participant/listener pair in ruote"
 end