fare 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19284af00a69196303261e5f9ed526c44f5148d7
-  data.tar.gz: ab17ec672508a98d779150174aea1b31e48c735d
+  metadata.gz: 132b90179b7fd7df7ec8cc62eca402f173e83aac
+  data.tar.gz: 848631e42f06ede13aa9ff9594de1ceec6538886
 SHA512:
-  metadata.gz: dc6d680546cc48699b9fc6bd93c0c3ab0184e56c0d20746adb6d0dd14a433b974b01c8eb0a8e79a89dc0b388826033db3a883ef81999c091f7e8399a3d561c9d
-  data.tar.gz: 382058f8efad2a7e10441514527c315ca1d2a18383e8715ea0f89021f41edf2e31f6ec1bc55138580897a30fcbd24fc01beff903f21ab4731dc7fbe5dcfe0712
+  metadata.gz: 2276e4db0c56de7ad437c85f99324b7f531b300bd6b5f47c57d3c56976faa10e0d5daf53bbb18fd1d2a7cb8e823ca9b4c34ab825f7540803c03dcde962be56b9
+  data.tar.gz: 7dede1a297d9da395b71480d61ddf141511ff07cebee00240cf95d66982e802a2efd83a93ee997cd15277be1cafdff72ada426ac38cb1334bb084f0468a2722c

data/lib/fare/subscriber.rb

@@ -1,17 +1,24 @@
 require "timeout"
+require "thread"
 
 module Fare
   class Subscriber
     UnknownSubscriber = Class.new(ArgumentError)
 
+    BUSY_MUTEX = Mutex.new
+
     attr_reader :configuration
 
     def initialize(configuration, options = {})
-      name = (options[:name] || configuration.app_name).to_s
-      subscriber_config = configuration.fetch_subscriber(name)
+      @configuration = configuration
+      @name = (options[:name] || configuration.app_name).to_s
+      subscriber_config = configuration.fetch_subscriber(@name)
       subscriber_config.load_setup
-      @sqs_queue = configuration.fetch_subscriber_queue(name)
+      @sqs_queue = configuration.fetch_subscriber_queue(@name)
       @stacks = subscriber_config.stacks
+      @concurrency = options.fetch(:concurrency, 1)
+      @busy = 0
+      set_program_name
     end
 
     def produce(queue)
@@ -24,6 +31,7 @@ module Fare
     end
 
     def consume(message)
+      increment_busy
       event = Event.deserialize(message.body)
       @stacks.each do |stack|
         if stack.handles?(event)
@@ -31,6 +39,35 @@ module Fare
         end
       end
       message.delete
+    ensure
+      decrement_busy
+    end
+
+    private
+
+    def set_program_name
+      pattern = "fare subscriber (app: %{app}; queue: %{queue}; version: %{version}; busy: %{busy}/%{concurrency}; fare: %{fare_version})"
+
+      str = pattern % {
+        app: configuration.app_name.to_s,
+        queue: @name,
+        version: configuration.app_version,
+        busy: @busy,
+        concurrency: @concurrency,
+        fare_version: ::Fare::VERSION,
+      }
+
+      $PROGRAM_NAME = str
+    end
+
+    def increment_busy
+      BUSY_MUTEX.synchronize { @busy += 1 }
+      set_program_name
+    end
+
+    def decrement_busy
+      BUSY_MUTEX.synchronize { @busy -= 1 }
+      set_program_name
     end
 
   end

data/lib/fare/subscriber_cli.rb

@@ -65,6 +65,7 @@ module Fare
 
         parser.on "-c", "--concurrency NUM", Integer, "Set the number of threads (default: #{daemon_options[:concurrency]}" do |concurrency|
           daemon_options[:concurrency] = concurrency
+          subscriber_options[:concurrency] = concurrency
         end
 
         parser.on "-P", "--pid FILE", "The location of the PID file (required when daemonizing)" do |pid|
@@ -176,6 +177,7 @@ module Fare
 
         parser.on "-c", "--concurrency NUM", Integer, "Set the number of threads (default: #{daemon_options[:concurrency]}" do |concurrency|
           daemon_options[:concurrency] = concurrency
+          subscriber_options[:concurrency] = concurrency
         end
 
         parser.on "-P", "--pid FILE", "The location of the PID file (required)" do |pid|

data/lib/fare/version.rb

@@ -1,3 +1,3 @@
 module Fare
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fare
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk