flagger 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ee349b75c8fe210460e4d38f08a1163c26934d9d3479ee6816339f7c717b18
-  data.tar.gz: 05aaec4dcc582463ae66d06ab01dc49f359b8177c655640550f4386ccfa92ced
+  metadata.gz: 7eb7e52085ab82a9d5b50780ad0a3eb53af7153fbc95f6435023573320ea2d25
+  data.tar.gz: d955270253eeedd0b0fcf9fc3819b6d7062419fbde90f2fa265f8928eb33c3b0
 SHA512:
-  metadata.gz: 8a831fff34ffd437e578e7d201328fc2432364695eb09561e2e684b5f9c410dd5471e01d49f3f73a98fb4b587030d7dba8c5e62e35acf9ecce0bf496801392d9
-  data.tar.gz: b6b765ddf6dd34c7c8b3f450f3c549b0514157f29b8d6014929000fb36d58b36c93f231f232e3b1f5f271bd544a2c90b5da4496178ed222bad1ed4f6b73b60ee
+  metadata.gz: 22f9b69016e460c75d2a6536f7b79894ba7a4e1b3cca6e3a7b279b3534f630cd6ef6a2651554bb6846065c3aa2f624441b4ee9f3cfd80374fb8a4c872d1d79cb
+  data.tar.gz: e8a2ccb1e769b0a99a693a8025c90ef7389ff36fa9845184b225c62c0af3416338bb1890ab7580ed84722707d6bd7b563d3b8a48176b1f54be0a4416a261bad4

data/lib/flagger.rb

@@ -45,11 +45,20 @@ class Flagger
     @edge_url = options[:edge_url]
     @request_timeout = options[:request_timeout] || 10
 
-    @delegate&.cleanup
-    if @edge_url.nil? then
-      @delegate = FlaggerEnvironments::CloudDelegate.new(@env_key, @request_timeout)
-    else
-      @delegate = FlaggerEnvironments::MicroserviceDelegate.new(@env_key, @edge_url, @request_timeout)
+    applied_options = {
+      env_key: @env_key,
+      edge_url: @edge_url,
+      request_timeout: @request_timeout
+    }
+    if not @prev_options == applied_options
+      @prev_options = applied_options
+
+      @delegate&.cleanup
+      if @edge_url.nil? then
+        @delegate = FlaggerEnvironments::CloudDelegate.new(@env_key, @request_timeout)
+      else
+        @delegate = FlaggerEnvironments::MicroserviceDelegate.new(@env_key, @edge_url, @request_timeout)
+      end
     end
   end
 

data/lib/flagger/cloud.rb

@@ -4,6 +4,7 @@ require 'faye/websocket'
 require 'json'
 require 'lru_redux'
 require 'set'
+require 'thread'
 require 'flagger/models'
 require 'flagger/stat'
 require 'flagger/version'
@@ -30,6 +31,7 @@ module FlaggerEnvironments
 
       @ingestion_max_items = 500
       @ingestion_interval = 30
+      @ingestion_lock = Mutex.new
 
       @entities = []
       @stats = []
@@ -57,17 +59,13 @@ module FlaggerEnvironments
         STDERR.puts 'Failed to retrieve initial gating info from CloudFront backup', e.backtrace
       end
 
-      if EM.reactor_running? then
-        em_subscribe_updates
-        em_ingestion_timer
-      else
-        Thread.new {
-          EM.run {
-            em_subscribe_updates
-            em_ingestion_timer
-          }
-        }
-      end
+      # ensure EventMachine is running
+      Thread.new { EventMachine.run } unless EventMachine.reactor_running?
+      Thread.pass until EventMachine.reactor_running?
+
+      em_subscribe_updates
+      em_police_updates
+      em_ingestion_timer
     end
 
     def get_gating_info(url, stat_name)
@@ -93,6 +91,7 @@ module FlaggerEnvironments
 
       @ws.on :message do |event|
         begin
+          @last_ws_update = Time.now
           @gating_info = FlaggerModels::GatingInfo.new(JSON.parse(event.data))
           update_sdk_vars(@gating_info)
         rescue Exception => e
@@ -103,14 +102,55 @@ module FlaggerEnvironments
       @ws.on :close do |event|
         STDERR.puts ['Connection closed to Airship update server', event.code, event.reason] unless @ws_unsubbed
         EventMachine::Timer.new(5) do
-          em_subscribe_updates
-        end unless @ws_unsubbed
+          em_subscribe_updates unless @ws_unsubbed
+        end
       end
     end
 
     def unsubscribe_updates()
       @ws_unsubbed = true
-      @ws.close()
+      @ws&.close
+    end
+
+    def em_police_updates
+      ping_timer = EventMachine::PeriodicTimer.new(5) do
+        if @cleaning then
+          ping_timer.cancel
+        else
+          @ws&.ping do
+            @last_ws_update = Time.now
+          end
+        end
+      end
+
+      police_update_timer = EventMachine::PeriodicTimer.new(30) do
+        if @cleaning then
+          police_update_timer.cancel
+        else
+          if Time.now - (@last_ws_update || Time.new(0)) > 30
+            STDERR.puts 'Did not receive a keepalive for more than 30 seconds. Reconnecting.'
+            @ws&.close
+          end
+        end
+      end
+
+      poll_gating_info_timer = EventMachine::PeriodicTimer.new(60) do
+        if @cleaning then
+          poll_gating_info_timer.cancel
+        else
+          if Time.now - (@last_ws_update || Time.new(0)) > 60
+            EM.defer(proc {
+                       STDERR.puts 'Did not receive a keepalive for more than 60 seconds. Polling gating info.'
+                       begin
+                         get_gating_info("#{CLOUDFRONT_GATING_INFO_ENDPOINT}/#{@env_key}", 'duration__cloudfront_gating_info')
+                         STDERR.puts 'Polled gating info from CloudFront'
+                       rescue Exception => e
+                         STDERR.puts 'Failed polling gating info from CloudFront', e.backtrace
+                       end
+                     })
+          end
+        end
+      end
     end
 
     def update_sdk_vars(gating_info)
@@ -171,41 +211,44 @@ module FlaggerEnvironments
       )
 
       if should_ingest then
-        begin
-          entities = @entities
-          stats = @stats
-          exposures = @exposures
-          flags = @flags.to_a
-          @entities = []
-          @stats = []
-          @exposures = []
-          @ingested_flags.merge(@flags)
-          @flags = Set[]
-
-          conn = Faraday.new(url: "#{IDENTIFY_ENDPOINT}/#{@env_key}")
-          response = conn.post do |req|
-            req.options.timeout = @request_timeout
-            req.headers['Content-Type'] = 'application/json'
-            req.body = JSON.generate(
-              {
-                'sdk_info' => {
-                  'name' => 'ruby',
-                  'version' => FlaggerUtils::VERSION
-                },
-                'objects' => entities,
-                'stats' => stats,
-                'exposures' => exposures,
-                'flags' => flags
-              })
-          end
-          if response.status != 200 then
-            STDERR.puts 'Failed to upload entities', response.status
-            nil
-          end
-        rescue Exception => e
-          STDERR.puts 'Failed to upload entities', e
-          nil
-        end
+        entities = @entities
+        stats = @stats
+        exposures = @exposures
+        flags = @flags.to_a
+        @entities = []
+        @stats = []
+        @exposures = []
+        @ingested_flags.merge(@flags)
+        @flags = Set[]
+
+        EM.defer(
+          proc {
+            begin
+              conn = Faraday.new(url: "#{IDENTIFY_ENDPOINT}/#{@env_key}")
+              response = conn.post do |req|
+                req.options.timeout = @request_timeout
+                req.headers['Content-Type'] = 'application/json'
+                req.body = JSON.generate(
+                  {
+                    'sdk_info' => {
+                      'name' => 'ruby',
+                      'version' => FlaggerUtils::VERSION
+                    },
+                    'objects' => entities,
+                    'stats' => stats,
+                    'exposures' => exposures,
+                    'flags' => flags
+                  })
+              end
+              if response.status != 200 then
+                STDERR.puts 'Failed to upload entities', response.status
+                nil
+              end
+            rescue Exception => e
+              STDERR.puts 'Failed to upload entities', e
+              nil
+            end
+          })
       end
     end
 
@@ -216,9 +259,9 @@ module FlaggerEnvironments
 
         seconds = (seconds + 1) % @ingestion_interval
         if seconds == 0 then
-          EM.defer(proc {
+          @ingestion_lock.synchronize {
             maybe_ingest(true)
-          })
+          }
         end
       end
     end
@@ -226,31 +269,41 @@ module FlaggerEnvironments
     def cleanup()
       @cleaning = true
       unsubscribe_updates
-      maybe_ingest(true)
+      @ingestion_lock.synchronize {
+        maybe_ingest(true)
+      }
     end
 
     def save_entity(entity)
-      if @entity_lru_hashes[entity.id] != entity.hash then
-        @entity_lru_hashes[entity.id] = entity.hash
-        @entities.push(entity.attrs)
-        maybe_ingest()
-      end
+      @ingestion_lock.synchronize {
+        if @entity_lru_hashes[entity.id] != entity.hash then
+          @entity_lru_hashes[entity.id] = entity.hash
+          @entities.push(entity.attrs)
+          maybe_ingest()
+        end
+      }
     end
 
     def save_stat(stat)
-      @stats.push(stat)
-      @stats = FlaggerUtils::Stat.compact(@stats)
-      maybe_ingest()
+      @ingestion_lock.synchronize {
+        @stats.push(stat)
+        @stats = FlaggerUtils::Stat.compact(@stats)
+        maybe_ingest()
+      }
     end
 
     def save_exposure(exposure)
-      @exposures.push(exposure)
-      maybe_ingest()
+      @ingestion_lock.synchronize {
+        @exposures.push(exposure)
+        maybe_ingest()
+      }
     end
 
     def save_flag(flag)
-      @flags.add(flag)
-      maybe_ingest()
+      @ingestion_lock.synchronize {
+        @flags.add(flag)
+        maybe_ingest()
+      }
     end
 
     def stringify_keys(hash)
@@ -434,7 +487,9 @@ module FlaggerEnvironments
         identify_entity(entity)
       end
 
-      maybe_ingest(true)
+      @ingestion_lock.synchronize {
+        maybe_ingest(true)
+      }
     end
   end
 end

data/lib/flagger/version.rb

@@ -1,4 +1,4 @@
 module FlaggerUtils
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flagger
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Airship Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday