emissary 1.3.20 → 1.3.21

data/lib/emissary/server.rb

@@ -0,0 +1,98 @@
+#   Copyright 2010 The New York Times
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+#
+require 'emissary/servolux'
+require 'eventmachine'
+
+module Emissary
+  class Server < Servolux::Server
+    attr_accessor :running
+    
+    def initialize(name, opts = {}, &block)
+      opts[:logger] = Emissary.logger
+      @running = false
+      @operator = opts.delete(:operator) or raise Emissary::Error.new(ArgumentError, "Operator not provided")
+  
+      at_exit { shutdown! :graceful }    
+      super(name, opts, &block)
+    end
+    
+    def running?() !!@running; end
+  
+    def shutdown! type = :graceful
+      begin
+        case type
+          when :graceful
+            @operator.shutdown! unless not @operator.connected?
+            EM.stop_event_loop
+        end
+      rescue Exception => e
+        Emissary.logger.error "Exception caught during graceful shutdown: #{e.class.name}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
+      ensure
+        exit!(0)
+      end
+    end
+    
+    alias :int :shutdown!
+    alias :term :shutdown!
+    
+    # override Servolux::Server's startup because we don't need threaded here.
+    # also, we want to enforce exiting on completion of startup's run
+    def startup
+      return self unless not running?
+
+      begin
+        create_pid_file
+        trap_signals
+        run
+      rescue Exception => e
+        # if something is caught here, then we can only log it. at this point we are in an
+        # unknown state and can only delete our pid file and #exit!. Attempting to call
+        # our #term method could cause other problems here.
+        Emissary.logger.error "Server '#{$0}': #{e.class.name}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
+      ensure
+        delete_pid_file
+        shutdown! :hard
+      end
+      
+      return self
+    end
+
+    def run
+      return unless not running?
+
+      thr = Thread.new { EM.run }
+
+      begin
+        EM.add_periodic_timer(0.5) { @operator.shutdown! unless not @operator.shutting_down? }
+
+        begin
+          $0 = @name
+          logger.info "Starting up new Operator process"
+          @running = @operator.run
+        rescue Exception => e
+          Emissary.logger.error "Server '#{$0}': #{e.class.name}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
+          raise e
+        end
+      rescue ::Emissary::Error::ConnectionError => e
+        shutdown! :hard
+      rescue Exception => e
+        shutdown! :graceful
+      end
+
+      thr.join
+    end
+  end
+end

data/lib/emissary/servolux.rb

@@ -0,0 +1,75 @@
+#   Copyright 2010 The New York Times
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+#
+require 'servolux'
+
+# monkey patches for servolux
+class Servolux::Daemon
+  # provide pid to external libraries
+  def get_pid() retrieve_pid; end
+  def alive?
+    pid = retrieve_pid
+    Process.kill(0, pid)
+    true
+  rescue TypeError # don't fail on nil being passed to kill
+    # usually means pid was nil, so return false
+    false
+  rescue Errno::ESRCH, Errno::ENOENT
+    false
+  rescue Errno::EACCES => err
+    logger.error "You do not have access to the PID file at " \
+                 "#{pid_file.inspect}: #{err.message}"
+    false
+  end
+end
+
+class Servolux::Piper
+  def initialize( *args )
+    opts = args.last.is_a?(Hash) ? args.pop : {}
+    mode = args.first || 'r'
+
+    unless %w[r w rw].include? mode
+      raise ArgumentError, "Unsupported mode #{mode.inspect}"
+    end
+
+    @timeout = opts.key?(:timeout) ? opts[:timeout] : nil
+    socket_pair = Socket.pair(Socket::AF_UNIX, Socket::SOCK_STREAM, 0)
+    @child_pid = Kernel.fork
+
+    if child?
+      @socket = socket_pair[1]
+      socket_pair[0].close
+
+      case mode
+      when 'r'; @socket.close_read
+      when 'w'; @socket.close_write
+      end
+    else
+      # prevent zombie processes - register disinterest
+      # in return status of child process
+      Process.detach @child_pid
+
+      @socket = socket_pair[0]
+      socket_pair[1].close
+
+      case mode
+      when 'r'; @socket.close_write
+      when 'w'; @socket.close_read
+      end
+
+    end
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: emissary
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 1
   - 3
-  - 20
-  version: 1.3.20
+  - 21
+  version: 1.3.21
 platform: ruby
 authors: 
 - Carl P. Corliss
@@ -189,10 +189,46 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin/emissary-setup
-- bin/emissary-send-message
-- bin/emissary
 - bin/amqp-listen
+- bin/emissary
+- bin/emissary-send-message
+- bin/emissary-setup
+- lib/emissary/agent/emissary.rb
+- lib/emissary/agent/error.rb
+- lib/emissary/agent/file.rb
+- lib/emissary/agent/gem.rb
+- lib/emissary/agent/mysql.rb
+- lib/emissary/agent/ping.rb
+- lib/emissary/agent/proxy.rb
+- lib/emissary/agent/rabbitmq.rb
+- lib/emissary/agent/sshkeys.rb
+- lib/emissary/agent/stats.rb
+- lib/emissary/agent/test.rb
+- lib/emissary/agent.rb
+- lib/emissary/config.rb
+- lib/emissary/core_ext/blank.rb
+- lib/emissary/core_ext/misc_object.rb
+- lib/emissary/core_ext/symbolize.rb
+- lib/emissary/daemon.rb
+- lib/emissary/errors.rb
+- lib/emissary/gem_helper.rb
+- lib/emissary/identity/ec2.rb
+- lib/emissary/identity/unix.rb
+- lib/emissary/identity.rb
+- lib/emissary/inifile.rb
+- lib/emissary/logger.rb
+- lib/emissary/message.rb
+- lib/emissary/operator/amqp.rb
+- lib/emissary/operator.rb
+- lib/emissary/server.rb
+- lib/emissary/servolux.rb
+- lib/emissary.rb
+- LICENSE
+- README.txt
+- Rakefile
+- Manifest.txt
+- VERSION.yml
+- History.txt
 homepage: http://nimbul.github.com/nimbul/
 licenses: []