madvertise-ext 0.3.0 → 0.4.0

data/lib/madvertise/ext/version.rb

@@ -1,6 +1,6 @@
 # @private
 module Madvertise
   module Ext
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/servolux/eventmachine.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+require 'eventmachine'
+require 'servolux'
+require 'thread'
+
+module Servolux
+  class EventMachineServer < Server
+
+    def initialize(name, opts = {})
+      super
+      EventMachine.error_handler do |e|
+        $log.exception(e)
+        raise e
+      end
+    end
+
+    def before_starting
+      @reactor = Thread.new do
+        begin
+          EventMachine.run { boot if respond_to?(:boot) }
+        rescue => e
+          $log.exception(e)
+        end
+      end
+    end
+
+    def after_stopping
+      $log.debug("eventmachine stop")
+      EventMachine.stop_event_loop if EventMachine.reactor_running?
+      @reactor.kill
+      @reactor.join if @reactor.is_a?(Thread)
+    end
+
+    def run
+    end
+
+  end
+end

data/lib/servolux/wrapper.rb

@@ -5,38 +5,38 @@ require 'servolux'
 require 'servolux/cli'
 
 module Servolux
-  def self.init_config(cli_class)
-    config = cli_class.parse_options
+  def self.parse_opts(cli_class)
+    opts = cli_class.parse_options
 
     # CLI.parse_options may have changed $0
     # so we reload the logger for good measure
     $log = init_logger
-    $log.level = config[:debug] ? :debug : :info
+    $log.level = opts[:debug] ? :debug : :info
 
-    return config
+    return opts
   end
 
   def self.wrap(server_class)
-    config = self.init_config(Servolux::CLI)
-    server_class.new(config).run
+    opts = self.parse_opts(Servolux::CLI)
+    server_class.new(opts).run
   rescue => e
     $log.exception(e)
     raise e
   end
 
   def self.wrap_daemon(server_class)
-    config = self.init_config(Servolux::DaemonCLI)
+    opts = self.parse_opts(Servolux::DaemonCLI)
 
-    server = server_class.new(config[:name], config.merge({
+    server = server_class.new(opts[:name], opts.merge({
       interval: 1,
       logger: $log,
-      pid_file: config[:pidfile]
+      pid_file: opts[:pidfile]
     }))
 
-    if config[:daemonize] or config[:kill]
+    if opts[:daemonize] or opts[:kill]
       daemon = Servolux::Daemon.new(:server => server)
 
-      if config[:kill]
+      if opts[:kill]
         daemon.shutdown
       else
         daemon.startup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madvertise-ext
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: madvertise-logging
@@ -86,6 +86,7 @@ files:
 - lib/madvertise/ext/transaction_id.rb
 - lib/madvertise/ext/version.rb
 - lib/servolux/cli.rb
+- lib/servolux/eventmachine.rb
 - lib/servolux/wrapper.rb
 - madvertise-ext.gemspec
 - spec/enumerable_spec.rb
@@ -108,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2076914703053798103
+      hash: 1335580830932580809
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2076914703053798103
+      hash: 1335580830932580809
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24