powertrack 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjZjMjc0OWE1ODU4NTUyNTY2Zjk1YzdiMjYxZDgxMjYwMTI0MmQyMg==
+    NTU5ZmE5N2E3YTQxMTc1ZTg2N2RjMmJmMDRhMWRkMzYzNjcxNGYzMg==
   data.tar.gz: !binary |-
-    MmEzNDQ0YWYzZGYwODcwNDM0MDU5MDc1YjdlZTIwMTRjMmRhNzZlYQ==
+    NWI4ZjlmZjQ0NGIyYTYzMjkzMGIyOTkwNzU3N2QxNzFiMzQ3NmEyZA==
 SHA512:
   metadata.gz: !binary |-
-    NTU5ZmE3MzI3NzUzYTYxYzgyNGZiYzBkYjllODdiMTA5M2YyYWIyN2Y3M2E2
-    M2ZhNDRmZWFlNTE1ZTI4YTA0OGZiNDg4NDFiYWQwOWRiNGMwNjhlMTIzZWRi
-    NGNhNzFiZTIyM2Q3Y2I4OTUzYmQ0ZmRmYjQ4ODRiODhkMjUzMzg=
+    MmFkZDBjODJjZGQxMzZjNGEwYTA5NTc4NTIwZjEzOWQ5MzE3YzAyMTc2MjY3
+    ZDg1YjA1ZjI3ZmEyYTIzMzU1OTY3NzU1YmE2ZGVhNDc2YWNiNjk1YzkwZTEx
+    M2NmMWVlNWJiZjFkNzMzMDUyODA2YzBkMjRkZjY4NGU4OTUzZjk=
   data.tar.gz: !binary |-
-    YzQxZjcxMDVmYTQzZmRlODNjMWIyNmNlNDczNWUyMTQzNzM5MmRlZDk2ZDJh
-    ZDhkNmU3MzRmMTFiZjBlM2RiZjYzZmQ4MzQ1MjI1YThjZGVmYjdjMWZjZTI0
-    OGUxYzYwY2JlY2Q3NDMwOWQ1N2NlMjg1MDI1ZjU2NzU5NGQzOGE=
+    YzE5NjQwMWNlOTg0Y2RmNDZkYmU5ZjZhYTkwZDQxZTE5MWI4NjZmNWJjZTVk
+    M2Q3ZDY5MGZjMTliN2U0ZjNkZWUxYjdkYmU4MTg3NDQwNDcwNTUyY2VmNzNh
+    Y2U0Y2E1MDhjNzcxM2NiMDg5MzYwNjZmNDk4YmRmNDdlZTRjZmI=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    powertrack (1.1.0)
+    powertrack (1.1.1)
       em-http-request (~> 1.1)
       eventmachine (~> 1.0)
       exponential-backoff (~> 0.0.2)

data/History.txt

@@ -1,3 +1,8 @@
+v1.1.1
+------
+
+  * Support retries in Replay mode
+
 v1.1.0
 ------
 

data/README.md

@@ -84,7 +84,7 @@ It's up to the developer's responsibility to complete message processing as soon
 possible. After 10 seconds (by default), the stop will be forced and a few messages
 already received but not processed yet may be lost.
 
-The ```:stop_timeout``` may be fine-tune when passing options to the tracker.
+The ```:stop_timeout``` may be fine-tuned when passing options to the tracker.
 
 ## Disconnections and Retries
 
@@ -93,6 +93,9 @@ backoff retry mechanism when a disconnection happens. The reconnections can be
 fine-tuned through the ```:max_retries``` and ```:backoff``` options passed to
 the ```track``` call.
 
+Note that the retries counter is reset each time the client manages to receive
+a message after a disconnection except in Replay mode (see further).
+
 ## Backfill
 
 Backfill is a feature provided by GNIP to avoid losing activities when being
@@ -112,9 +115,14 @@ object.
 Once Replay is activated, you use the stream as previously, starting by
 configuring some rules that define which activities you will recover. Once done,
 you can track the stream by specifying a timeframe with the ```:from```
-and ```:to options```. By default, replay happens over 30 minutes, starting 1
+and ```:to``` options. By default, replay happens over 30 minutes, starting 1
 hour ago.
 
+Regarding Replay mode and ```:max_retries```, the client does not reset the
+retry counter and will never reconnect more than the max number of retries
+specified. This specific retry behavior in Replay mode prevents the client from
+replaying the same timeframe again and again when GNIP is unstable.
+
 ## Errors
 
 All the errors that come from PowerTrack are defined through an ad-hoc exception

data/lib/powertrack/streaming/stream.rb

@@ -391,8 +391,10 @@ module PowerTrack
             # get the message type and its (optional) level
             m_type, m_level = message_type(raw)
 
-            # reset retries when some (valid) data are received
-            if retrier.retrying? && m_level != :error
+            # reset retries when some (valid) data are received but not in replay
+            # mode where we don't want to retry on the same timeframe again and
+            # again when GNIP periodically fails
+            if !@replay && retrier.retrying? && m_level != :error
               logger.info "Resetting retries..."
               retrier.reset!
             end
@@ -423,7 +425,10 @@ module PowerTrack
           logger.info "Disconnected after #{retrier.retries} retries"
           disconnected = true
 
-          if closed
+          resp_status = http_client.response_header.status
+
+          # stop the stream if required so or the replay is simply over
+          if closed || (@replay && resp_status == DEFAULT_OK_RESPONSE_STATUS)
             # close immediately if required
             wait_til_defers_finish_and_stop(stop_timeout)
             # tell the retrier the tracking is over
@@ -432,7 +437,7 @@ module PowerTrack
             # cancel the periodic close watcher
             close_watcher.cancel
 
-            resp_status = http_client.response_header.status || DEFAULT_OK_RESPONSE_STATUS
+            resp_status ||= DEFAULT_OK_RESPONSE_STATUS
             resp_error = http_client.error
             resp_body = http_client.response
 

data/lib/powertrack/version.rb

@@ -1,3 +1,3 @@
 module PowerTrack
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/test/test_track_stream.rb

@@ -71,7 +71,7 @@ class TestTrackStream < Minitest::Test
                          on_activity: on_activity,
                          on_system: on_system,
                          close_now: close_now,
-                         max_retries: replay ? 0 : 2,
+                         max_retries: 2,
                          fake_disconnections: replay ? nil : 20,
                          from: from,
                          to: to)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: powertrack
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Laurent Farcy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler