workling 0.4.9.8 → 0.4.9.9

data/lib/workling.rb

@@ -76,6 +76,7 @@ module Workling
   def self.clients
     {
       'amqp' => Workling::Clients::AmqpClient,
+      'amqp_bunny' => Workling::Clients::AmqpBunnyClient,
       'amqp_exchange' => Workling::Clients::AmqpExchangeClient,
       'memcache' => Workling::Clients::MemcacheQueueClient,
       'starling' => Workling::Clients::MemcacheQueueClient,

data/lib/workling/clients/amqp_bunny_client.rb

@@ -0,0 +1,59 @@
+#
+#  An AMQP client based on the synchrounous Bunny library which
+#  is easier to use in many situations
+#
+module Workling
+  module Clients
+    class AmqpBunnyClient < Workling::Clients::BrokerBase
+
+      def self.load
+        begin
+          require 'bunny'
+        rescue LoadError => e
+          raise WorklingError.new("WORKLING: couldn't find the bunny amqp client")
+        end
+      end
+
+      # starts the client.
+      def connect
+        begin
+          @bunny = Bunny.new((Workling.config[:amqp_options] ||{}).symbolize_keys)
+          @bunny.start
+        rescue
+          raise WorklingError.new("Couldn't start bunny amqp client, ensure the AMQP server is running.")
+        end
+      end
+
+      # no need for explicit closing. when the event loop
+      # terminates, the connection is closed anyway. 
+      def close
+        @bunny.stop
+        # normal amqp does not require stopping
+      end
+
+      # subscribe to a queue
+      def subscribe(key)
+        @bunny.queue(queue_for(key)).subscribe(:timeout => 30) do |value|
+          data = Marshal.load(value) rescue value
+          yield data
+        end
+      end
+
+      # request and retrieve work
+      def retrieve(key)
+        @bunny.queue(queue_for(key)).pop[:payload]
+      end
+
+      def request(key, value)
+        data = Marshal.dump(value)
+        @bunny.queue(queue_for(key)).publish(data)
+      end
+
+      private
+        def queue_for(key)
+          "#{Workling.config[:prefix]}#{key}"
+        end
+
+    end
+  end
+end

data/lib/workling_daemon.rb

@@ -2,6 +2,15 @@ require 'optparse'
 
 class WorklingDaemon
 
+  def self.running_as_daemon?
+    !!@running_as_daemon
+  end
+
+  def self.run_as_daemon!
+    @running_as_daemon = true
+  end
+
+
   def self.partition_options(args)
     daemon = []
     workling = []
@@ -92,6 +101,8 @@ class WorklingDaemon
 
 
   def self.run(options)
+    WorklingDaemon.run_as_daemon!
+
     boot_with options
     poller = initialize_workling(options)
 
@@ -103,7 +114,7 @@ class WorklingDaemon
     begin
       poller.listen
     ensure
-      puts '** No Worklings found.' if Workling::Discovery.discovered.empty?
+      puts '** No Worklings found.' if Workling::Discovery.discovered_workers.empty?
       puts '** Exiting'
     end
   end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 4
   - 9
-  - 8
-  version: 0.4.9.8
+  - 9
+  version: 0.4.9.9
 platform: ruby
 authors: 
 - Rany Keddo
@@ -36,6 +36,7 @@ files:
 - lib/extensions/mattr_accessor.rb
 - lib/workling/base.rb
 - lib/workling/clients/amqp_client.rb
+- lib/workling/clients/amqp_bunny_client.rb
 - lib/workling/clients/amqp_exchange_client.rb
 - lib/workling/clients/backgroundjob_client.rb
 - lib/workling/clients/base.rb