subserver 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 024346e0b4fd27cc57e916d853d39b08de68d29f
-  data.tar.gz: d697e91f0fa56888c6a601fc58c66631fb64e61f
+  metadata.gz: 391f8405b0cd22e8f4aa640004133d2d73f52937
+  data.tar.gz: ed7f18529bd0c0d5aa297fc8bb9b0cc5ac271de5
 SHA512:
-  metadata.gz: 0a3eaddf316cfe3910c59dde627db754e9f53941bf6614cf4e6fd2ce56f312dc1485eb1bcfef3af406fffd3ea6dcf6b10cc289be104a7ce138b9aa75e969392a
-  data.tar.gz: 64b24f88d670664662b2ee7eea621d3ef3aa19d4c8e8ca6f84b4489c7140afad07c031adb59587a20af6a0c7ea9128c7d0c0d348cd844beaeb4df0a80c728bef
+  metadata.gz: 7bb3386a5cb879d6905caed2f65789a77ce7c3c673861bf0277563bea6b34204a7f4ce0803c14f4f44255a48dc0ccad2d4f9ffe475ac56e764cf45883ae3843a
+  data.tar.gz: ce1bfe6ba1fa69aeb424051c0932f019cd9284b885d36d76c5e25dc7fbf6b8d6c587d7f061bde9a715e28f210dbaa82a7bf3f16d62cd40fe3744a079268e38b4

data/lib/subserver/listener.rb

@@ -102,8 +102,10 @@ module Subserver
     def process_message(received_message)
       begin
         logger.debug("Executing Middleware")
-        Subserver.middleware.invoke(@subscriber, received_message) do
-          execute_processor(@subscriber, received_message)
+        @reloader.call do
+          Subserver.middleware.invoke(@subscriber, received_message) do
+            execute(@subscriber, received_message)
+          end
         end
       rescue Subserver::Shutdown
         # Reject message if shutdown
@@ -114,48 +116,9 @@ module Subserver
       end
     end
 
-    def execute_processor(subscriber, received_message)
+    def execute(subscriber, received_message)
       subscriber.new.perform(received_message)
     end
 
-    # Ruby doesn't provide atomic counters out of the box so we'll
-    # implement something simple ourselves.
-    # https://bugs.ruby-lang.org/issues/14706
-    class Counter
-      def initialize
-        @value = 0
-        @lock = Mutex.new
-      end
-
-      def incr(amount=1)
-        @lock.synchronize { @value = @value + amount }
-      end
-
-      def reset
-        @lock.synchronize { val = @value; @value = 0; val }
-      end
-    end
-
-    PROCESSED = Counter.new
-    FAILURE = Counter.new
-    # This is mutable global state but because each thread is storing
-    # its own unique key/value, there's no thread-safety issue AFAIK.
-    WORKER_STATE = {}
-
-    def stats(job_hash, queue)
-      tid = Subserver::Logging.tid
-      WORKER_STATE[tid] = {:queue => queue, :payload => job_hash, :run_at => Time.now.to_i }
-
-      begin
-        yield
-      rescue Exception
-        FAILURE.incr
-        raise
-      ensure
-        WORKER_STATE.delete(tid)
-        PROCESSED.incr
-      end
-    end
-
   end
 end

data/lib/subserver/middleware/active_record.rb

@@ -14,7 +14,7 @@ module Subserver
       def call(*args)
         yield
       ensure
-        ::ActiveRecord::Base.clear_active_connections!
+        ::ActiveRecord::ConnectionAdapters::ConnectionHandler.clear_active_connections! 
       end
     end
   end

data/lib/subserver/pubsub.rb

@@ -8,7 +8,7 @@ module Subserver
 
     def self.initialize_client
       @client = Google::Cloud::Pubsub.new(
-        project_id: options[:project_id],
+        project_id: options[:project_id] || ENV['PUBSUB_PROJECT_ID'],
         credentials: ( File.expand_path(options[:credentials]) if options[:credentials] )
       )
     end

data/lib/subserver/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Subserver
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subserver
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Scott Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-pubsub