smith 0.5.8 → 0.5.10

data/bin/agency

@@ -1,13 +1,11 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
 
-require 'pp'
-require 'pathname'
-
-root_path = Pathname.new(__FILE__).dirname.join('..').expand_path
-$:.unshift(root_path.join('lib'))
+$:.unshift(File.dirname(__FILE__) + '/../lib')
 
+require 'pp'
 require 'smith'
+require 'smith/daemon'
 require 'smith/acl_compiler'
 require 'smith/application/agency'
 
@@ -16,40 +14,70 @@ module Smith
 
     include Logger
 
-    def initialize(root)
+    AGENCY_NAME = 'agency'
+
+    def initialize(opts={})
 
-      Smith.compile_acls
-      Smith.load_acls
+      @options = opts
+      options_check
 
+      @daemon = Daemon.new(AGENCY_NAME, opts[:daemon], opts[:pid_dir])
       @agency = Agency.new(:paths => Smith.agent_paths)
 
+      Smith.shutdown_hook do
+        puts "Shutting down"
+      end
+
       # Setup signal handlers to clean up.
       %w{TERM INT QUIT}.each do |sig|
-        trap sig, proc { puts "Shutting down"; @agency.stop }
+        trap sig, proc { @agency.stop }
       end
     end
 
     def run
-      Smith.start do
+      if @daemon.running?
+        logger.fatal { "The agency is alredy running" }
+      else
+        @daemon.daemonise
 
-        # This block is here so the that the shutdown hook added in
-        # Smith.start runs last. Yes I know this is leaky but that's how
-        # it is at the moment.
+        Smith.compile_acls
+        Smith.load_acls
 
-        Smith.shutdown_hook do
-          # TODO put this as a command line option
-          if false
-            @compiler.clear_cache
+        Smith.start do
+          # This block is here so the that the shutdown hook added in
+          # Smith.start runs last. Yes I know this is leaky but that's how
+          # it is at the moment.
+
+          Smith.shutdown_hook do
+            @daemon.unlink_pid_file
           end
+
+          logger.info { "Starting #{File.basename($0)}" }
+          @agency.setup_queues
+          @agency.start_monitoring
         end
+      end
+    end
 
-        logger.info { "Starting #{File.basename($0)}" }
-        @agency.setup_queues
-        @agency.start_monitoring
+    private
+
+    def options_check
+      if @options[:daemon] && Regexp.new(/stdout|stderr/i).match(Smith.config.logging.appender[:type])
+        puts "Logger set to stdout and daemonise is true. Log messages will be sent to /dev/null."
       end
     end
   end
 end
 
-agency_runner = Smith::AgencyRunner.new(root_path)
+parser = Trollop::Parser.new do
+  opt :daemon,      "daemonise", :default => false, :short => :d
+  opt :pid,         "pid file", :type => :string, :short => :p
+end
+
+opts = Trollop::with_standard_exception_handling parser do
+  #raise Trollop::HelpNeeded if ARGV.size < 2
+  parser.parse ARGV
+end
+
+agency_runner = Smith::AgencyRunner.new(opts)
 agency_runner.run

data/bin/smithctl

@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
 
+%w{TERM INT QUIT}.each do |sig|
+  trap sig, proc { exit }
+end
+
+
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'smith'
@@ -10,58 +15,34 @@ module Smith
 
     include Logger
 
-    AGENCY_TIMEOUT = 60
-
-    def initialize
-      log_level(:info)
+    def initialize(options={})
+      log_level((options[:log_level_given]) ? options[:log_level].to_sym : :info)
+      @timeout = (options[:timeout_given]) ? options[:timeout] : Smith.config.agency.timeout
     end
 
     def send_command(command, args, &blk)
       begin
         send("#{Command.command_type(command)}_command", command, args, &blk)
-      rescue Smith::Command::UnkownCommandError => e
-        puts e.message
-        Smith.stop(true)
+      rescue Smith::Command::UnknownCommandError => e
+        blk.call(e.message)
       end
     end
 
     private
 
     def smithctl_command(command, args, &blk)
-      Smith.channel.on_error do |ch,channel_close|
-        case channel_close.reply_code
-        when 404
-          puts "No such queue: #{extract_queue(channel_close.reply_text)}"
-        when 406
-          puts "Queue in use: #{extract_queue(channel_close.reply_text)}"
-        else
-          puts channel_close.reply_text
-          puts channel_close.reply_code
-        end
-      end
-
       responder = Messaging::Responder.new
       responder.callback do |v|
-        puts v if v
-        Smith.stop(true)
+        blk.call(v)
       end
 
       Command.run(command, args, :responder => responder)
     end
 
-    def extract_queue(message)
-      match = /.*?'(.*?)'.*$/.match(message) #[1]
-      if match && match[1]
-        match[1].sub(/smith\./, '')
-      else
-        message
-      end
-    end
-
     def agency_command(command, args, &blk)
-      Messaging::Sender.new('agency.control', :auto_delete => true, :durable => false, :persistent => true,  :strict => true).ready do |sender|
+      Messaging::Sender.new('agency.control', :auto_delete => false, :durable => false, :persistent => true,  :strict => true).ready do |sender|
 
-        sender.timeout(AGENCY_TIMEOUT) { puts "Timeout. Is the agency still running"; Smith.stop(true) }
+        sender.timeout(@timeout) { blk.call("Timeout. Is the agency still running?") }
 
         payload = ACL::Payload.new(:agency_command).content(:command => command, :args => args)
 
@@ -71,34 +52,56 @@ module Smith
           end
         end
 
-        errback = proc do puts "Agency not running"
-          Smith.stop(true)
+        errback = proc do
+          blk.call("Agency not running.")
         end
 
         sender.consumers?(callback, errback)
       end
     end
   end
-end
 
-command = ARGV.shift
-args = ARGV
+  parser = Trollop::Parser.new do
+    version Smith::VERSION
+    banner <<-EOS
 
-command || (puts "usage #{File.basename($0)} <command> opts]"; exit 2)
+Command line interface to control Smith.
 
-trap 'INT', proc { (Smith.running?) ? Smith.stop(true) : exit}
+Usage:
+  smithctl commands
+  smithctl <command> [options]
+    EOS
 
-Smith.load_acls
+    stop_on Command.commands
+    opt :log_level, "Set the log level of smithctl only.", :short => :l, :type => :string
+    opt :timeout,   "Specify the timeout when communicating with the agency.", :short => :t, :type => :integer, :default => 60
+  end
 
-control = Smith::SmithControl.new
+  opts = Trollop::with_standard_exception_handling parser do
+    raise Trollop::HelpNeeded if ARGV.size < 1
+    parser.parse(ARGV).tap do
+      unless Command.commands.include?(ARGV.first)
+        puts "Unknown command: #{ARGV.first}"
+        exit 1
+      end
+    end
+  end
 
-Smith.on_error do
-  Smith.stop(true)
-end
+  command = ARGV.shift
+  args = ARGV
 
-Smith.start(:quiet => true) do
-  control.send_command(command, args) do |result|
-    puts result if result && !result.empty?
-    Smith.stop(true)
+  %w{TERM INT QUIT}.each do |sig|
+    trap sig, proc { (Smith.running?) ? Smith.stop(true) : exit}
+  end
+
+  Smith.load_acls
+
+  control = SmithControl.new(opts)
+
+  Smith.start do
+    control.send_command(command, args) do |result|
+      puts result if result && !result.empty?
+      Smith.stop(true)
+    end
   end
 end

data/lib/smith.rb

@@ -26,8 +26,8 @@ module Smith
       @channel
     end
 
-    def on_error=(handler)
-      @handler = handler
+    def environment
+      ENV['SMITH_ENV'] || 'development'
     end
 
     def config
@@ -81,8 +81,15 @@ module Smith
       EM.reactor_running?
     end
 
-    def on_error(&blk)
-      @on_error = blk
+    # Define a channel error handler.
+    def on_error(chain=false, &blk)
+      # This strikes me as egregiously wrong but I don't know how to
+      # overwrite an already existing handler.
+      if chain
+        Smith.channel.callbacks[:error] << blk
+      else
+        Smith.channel.callbacks[:error] = [blk]
+      end
     end
 
     def start(opts={}, &block)
@@ -134,19 +141,14 @@ module Smith
         AMQP::Channel.new(connection) do |channel,ok|
           @channel = channel
           # Set up QOS. If you do not do this then the subscribe in receive_message
-          # will get overwelmd and the whole thing will collapse in on itself.
+          # will get overwhelmed and the whole thing will collapse in on itself.
           channel.prefetch(1)
 
-          if @on_error
-            channel.on_error(&@on_error)
-          else
-            # Log the error and stop the agency when there are channel errors.
-            # TODO Add recovery instead of stopping the agency.
-            channel.on_error do |ch,channel_close|
-              logger.fatal { "Channel level exception: #{channel_close.reply_text}. Class id: #{channel_close.class_id}, Method id: #{channel_close.method_id}, Status code : #{channel_close.reply_code}" }
-              logger.fatal { "Agency is exiting" }
-              Smith.stop(true)
-            end
+          # Set up a default handler.
+          on_error do |ch,channel_close|
+            logger.fatal { "Channel level exception: #{channel_close.reply_code}: #{channel_close.reply_text}" }
+            logger.fatal { "Exiting" }
+            Smith.stop(true)
           end
 
           # Set up auto-recovery. This will ensure that the AMQP gem reconnects each
@@ -198,7 +200,7 @@ module Smith
       # Only display the following settings.
       s = settings.select { |k,v| [:user, :pass, :vhost, :host].include?(k) }
 
-      logger.fatal { "Authenticaton failure." }
+      logger.fatal { "Authentication failure." }
       logger.info { "Details:" }
       s.each do |k,v|
         logger.info { " Setting: %-7s%s" %  [k, v] }
@@ -227,12 +229,14 @@ require_relative 'smith/agent_process'
 require_relative 'smith/agent_monitoring'
 require_relative 'smith/command'
 require_relative 'smith/command_base'
+require_relative 'smith/exceptions'
+require_relative 'smith/version'
+
 require_relative 'smith/messaging/amqp_options'
 require_relative 'smith/messaging/queue_factory'
 require_relative 'smith/messaging/payload'
 require_relative 'smith/messaging/acl/default'
 require_relative 'smith/messaging/endpoint'
-require_relative 'smith/messaging/exceptions'
 require_relative 'smith/messaging/responder'
 require_relative 'smith/messaging/receiver'
 require_relative 'smith/messaging/sender'

data/lib/smith/acl_compiler.rb

@@ -19,10 +19,12 @@ module Smith
       @cache_path = Smith.acl_cache_path
     end
 
-    # Compile any protocol buffer files. This checks the timestamp
-    # to see if the file needs compiling.
+    # Compile any protocol buffer files. This checks the timestamp to see if
+    # the file needs compiling. This is done in a subprocess to stop the agency
+    # from dying. I think it's a problem with the class being loaded twice but
+    # I don't actually know that so this could be considered a bit brute force.
     def compile
-      fork do
+      Process.fork do
         logger.debug { "Protocol buffer cache path: #{@cache_path}" }
         Smith.acl_path.each do |path|
           results = {}
@@ -35,6 +37,7 @@ module Smith
           end
         end
       end
+      Process.wait
       @cache_path
     end
 

data/lib/smith/agent.rb

@@ -5,8 +5,6 @@ module Smith
 
     include Logger
 
-    @@agent_options = Smith.config.agent
-
     attr_reader :factory, :name, :pid
 
     def initialize(options={})
@@ -36,7 +34,7 @@ module Smith
       start_keep_alive
     end
 
-    # Overide this method to implement your own agent. You can use task but this may
+    # Override this method to implement your own agent. You can use task but this may
     # go away in the future. This method must not block.
     def run
       raise ArgumentError, "You need to call Agent.task(&block)" if @@task.nil?
@@ -90,19 +88,10 @@ module Smith
       # Options supported:
       # :monitor,   the agency will monitor the agent & if dies restart.
       # :singleton, only every have one agent. If this is set to false
-      #             multiple agents are allow.
+      #             multiple agents are allowed.
       def options(opts)
-        opts.each { |k,v| merge_options(k, v) }
-      end
-
-      def merge_options(option, value)
-        if @@agent_options[option]
-          @@agent_options[option] = value
-        else
-          raise ArgumentError, "Unknown option: #{option}"
-        end
+        Smith.config.agent._merge!(opts)
       end
-      private :merge_options
     end
 
     protected
@@ -143,32 +132,32 @@ module Smith
             payload = ACL::Payload.new(:agent_stats).content do |p|
               p.agent_name = self.name
               p.pid = self.pid
-              p.rss = (File.read("/proc/#{pid}/statm").split[1].to_i * 4) / 1024 # This assums the page size is 4K & is MB
+              p.rss = (File.read("/proc/#{pid}/statm").split[1].to_i * 4) / 1024 # This assumes the page size is 4K & is MB
               p.up_time = (Time.now - @start_time).to_i
               factory.each_queue do |q|
-                p.queues << ACL::AgentStats::QueueStats.new(:name => q.denomalized_queue_name, :type => q.class.to_s, :length => q.counter)
+                p.queues << ACL::AgentStats::QueueStats.new(:name => q.denormalized_queue_name, :type => q.class.to_s, :length => q.counter)
               end
             end
 
             stats_queue.publish(payload)
           end
 
-          # The errback argument is set to nil so as to suppres the default message.
+          # The errback argument is set to nil so as to suppress the default message.
           stats_queue.consumers?(callback, nil)
         end
       end
     end
 
     def acknowledge_start
-      sender('agent.lifecycle', :auto_delete => true, :durable => false, :dont_cache => true) do |ack_start_queue|
-        message = {:state => 'acknowledge_start', :pid => $$.to_s, :name => self.class.to_s, :metadata => agent_options[:metadata], :started_at => Time.now.utc.to_i.to_s}
+      sender('agent.lifecycle', :auto_delete => false, :durable => false, :dont_cache => true) do |ack_start_queue|
+        message = {:state => 'acknowledge_start', :pid => $$, :name => self.class.to_s, :metadata => agent_options[:metadata], :started_at => Time.now.to_i}
         ack_start_queue.publish(ACL::Payload.new(:agent_lifecycle).content(agent_options.merge(message)))
       end
     end
 
     def acknowledge_stop(&block)
-      sender('agent.lifecycle', :auto_delete => true, :durable => false, :dont_cache => true) do |ack_stop_queue|
-        message = {:state => 'acknowledge_stop', :pid => $$.to_s, :name => self.class.to_s}
+      sender('agent.lifecycle', :auto_delete => false, :durable => false, :dont_cache => true) do |ack_stop_queue|
+        message = {:state => 'acknowledge_stop', :pid => $$, :name => self.class.to_s}
         ack_stop_queue.publish(ACL::Payload.new(:agent_lifecycle).content(message), &block)
       end
     end
@@ -176,8 +165,8 @@ module Smith
     def start_keep_alive
       if agent_options[:monitor]
         EventMachine::add_periodic_timer(1) do
-          sender('agent.keepalive', :auto_delete => true, :durable => false, :dont_cache => true) do |keep_alive_queue|
-            message = {:name => self.class.to_s, :pid => $$.to_s, :time => Time.now.utc.to_i.to_s}
+          sender('agent.keepalive', :auto_delete => false, :durable => false, :dont_cache => true) do |keep_alive_queue|
+            message = {:name => self.class.to_s, :pid => $$, :time => Time.now.to_i}
             keep_alive_queue.consumers? do |sender|
               keep_alive_queue.publish(ACL::Payload.new(:agent_keepalive).content(message))
             end
@@ -193,7 +182,7 @@ module Smith
     end
 
     def agent_options
-      @@agent_options._child
+      Smith.config.agent._child
     end
 
     def control_queue_name