magellan-gcs-proxy 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f274888037621b3123477b9770fe6a47aad3261f
-  data.tar.gz: a63901a3c16ee906bdfaabbef597abedfc959c36
+  metadata.gz: 50724872f81d7d6de7c7803628cd766428150f5d
+  data.tar.gz: bc1b1ed15f3239206268f2596b9769aa22cf683f
 SHA512:
-  metadata.gz: 5e9f4f0c29a3aa5537e717693daf8c5ec65ae9a228454a79c14e98cbbd0d0e6371388ecfa325b18215ec3f652fb46d4b597fa8fb8e37baf5b8aeb598409d3f4f
-  data.tar.gz: c640f5d0e52f2a8c27b96a8e4a72f707ee37561df9a956a75087098fc926d6704e7fc960de24a7cc0ce7335d97a966c8db6e52e00b4f8a461426db4cf6670e98
+  metadata.gz: ae86f4f6bd8b441cbc11fdd21ffa580cacbb81676d8f092b196ff961ad3924798c7d767d2c7a31e993d6b0ce67fbb6ebde99a5597bc13990c547f23158dbb40e
+  data.tar.gz: da279b3209b1b16931a870e260c74de94a2ecc6315ecf111b7774cdc5b3d101c73a97704e9d77a6f888bda517b591ac84050610bc87fd76f64ad64a92e315a8f

data/example/Gemfile.lock

@@ -76,7 +76,7 @@ GEM
     logging (2.1.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    magellan-gcs-proxy (0.1.3)
+    magellan-gcs-proxy (0.1.4)
       dotenv
       google-cloud-logging
       google-cloud-pubsub

data/example/config.yml

@@ -17,9 +17,9 @@ sustainer:
   #   specified by BLOCKS_BATCH_PUBSUB_SUBSCRIPTION
   #   You can check ACK_DEADLINE by `gcloud beta pubsub subscriptions list`
   #   ACK_DEADLINE is set by `--ack-deadline` option for `gcloud beta pubsub subscriptions create`.
-  delay: 600
+  delay: <%= ENV['BLOCKS_BATCH_SUSTAINER_DELAY'] || 600  %>
 
   # interval
   #   The interval to send delay message. It must be lower than delay
   #   Default: 90% of delay
-  interval: 540
+  interval: <%= ENV['BLOCKS_BATCH_SUSTAINER_INTERVAL'] || 540 %>

data/lib/magellan/gcs/proxy/pubsub_sustainer.rb

@@ -37,28 +37,47 @@ module Magellan
         end
 
         def run
+          reset_next_limit
           loop do
             debug("is sleeping #{interval} sec.")
-            unless wait_while_processing(interval)
+            unless wait_while_processing
               debug('is stopping.')
               break
             end
-            debug("is sending delay!(#{delay})")
-            message.delay! delay
-            debug("sent delay!(#{delay}) successfully")
+            send_delay
+            reset_next_limit
           end
           debug('stopped.')
         rescue => e
           logger.error(e)
         end
 
+        attr_reader :next_limit, :next_deadline
+        def reset_next_limit
+          now = Time.now.to_f
+          @next_limit = now + interval
+          @next_deadline = now + delay
+        end
+
+        def send_delay
+          debug("is sending delay!(#{delay})")
+          message.delay! delay
+          debug("sent delay!(#{delay}) successfully")
+        rescue Google::Cloud::UnavailableError => e
+          if Time.now.to_f < next_deadline
+            sleep(1) # retry interval
+            debug("is retrying to send delay! cause of [#{e.class.name}] #{e.message}")
+            retry
+          end
+          raise e
+        end
+
         def debug(msg)
           logger.debug("#{self.class.name} #{msg}")
         end
 
-        def wait_while_processing(seconds)
-          limit = Time.now.to_f + seconds
-          while Time.now.to_f < limit
+        def wait_while_processing
+          while Time.now.to_f < next_limit
             return false unless Thread.current[:processing_message]
             sleep(0.1)
           end

data/lib/magellan/gcs/proxy/version.rb

@@ -1,7 +1,7 @@
 module Magellan
   module Gcs
     module Proxy
-      VERSION = '0.1.3'.freeze
+      VERSION = '0.1.4'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-gcs-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv