optic-rails 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 436b23a12e9fffc72997a8908f2d5b1344480d4320948407366a6139270e2de8
-  data.tar.gz: a762c9f379234a5a8d3f7dede9c5127a02803440332a91e3dace73682242aad8
+  metadata.gz: 037a36f5c71f671b7a16453a1607bd13ef93d7eb854ced372d6acf07009012a5
+  data.tar.gz: a1ce7fc57558e87b59f9614c1bd76dcb160ff312470423d945a364811c4be121
 SHA512:
-  metadata.gz: 5309ef3c52760546e558ce70466e39317524220f8cbbbc0e6213f7160fe95079b0313ffc0a50c1028b18db8c83f75b70adb1221dd69a38c8d7add9bb5bf8b06d
-  data.tar.gz: 710b2f963094f48b474b9df379437d4e96479c6a5dd0794a92e160a70484acd7a0341a0d74f4fc07fde1bac90b169a4fd6baae9e2c2fc33edc8dcf781f698f26
+  metadata.gz: bfa40babcd6bbef3b11661c1f0683b271517c5032f02fa3326a81638eb73a632cd77bc31ebb6afc02174d60541a06116e30c19f1c643a36554beb3c2f1487250
+  data.tar.gz: 81b948991bd3fea677fdd4a883bb7fbad0b31859dd1597eb5692b4a8c11110d0be7336d06655902bcf1dee18576e8aaa49efecb2a58d4f1e9903edebbda508af

data/lib/optic/rails/railtie.rb

@@ -1,37 +1,81 @@
+require "action_cable_client"
+require "eventmachine"
+
 module Optic
   module Rails
     class Railtie < ::Rails::Railtie
       initializer "optic_rails.launch_client_thread" do |app|
+        # TODO use tagged logger, make it clear which thread log messages are coming from
+
+        # Get configuration
         api_key = app.config.optic_api_key # TODO fail gracefully if missing
         uri = app.config.optic_uri
-        puts "Launching Optic client thread"
-        Thread.new do
-
-          EventMachine.run do
-            puts "connecting"
-            client = ActionCableClient.new(uri, { channel: "MetricsChannel" }, true, { "Authorization" => "Bearer #{api_key}" })
-            client.connected do
-              puts "successfully connected"
-            end
 
-            client.errored { |msg| puts "ERROR: #{msg}" }
-
-            # called whenever a message is received from the server
-            client.received do |message|
-              puts "MESSAGE: #{message}"
-              command = message["message"]["command"]
-
-              case command
-              when "request_schema"
-                puts "Schema requested!"
-                client.perform "schema", message: Optic::Rails.get_entities
-              when "request_metrics"
-                puts "Metrics requested!"
-                client.perform "metrics", message: Optic::Rails.get_metrics(message["message"]["pivot"])
-              else
-                puts "unknown command!"
+        logger = ::Rails.logger
+
+        logger.debug "Starting supervisor thread"
+        supervisor = Thread.new do
+          loop do
+            logger.debug "Starting worker thread"
+            worker = Thread.new do
+              EventMachine.run do
+                client = ActionCableClient.new(uri, { channel: "MetricsChannel" }, true, { "Authorization" => "Bearer #{api_key}" })
+
+                client.connected do
+                  logger.debug "Optic agent connected"
+                end
+
+                client.disconnected do
+                  logger.warn "Optic agent disconnected, killing client thread"
+                  EventMachine.stop
+                end
+
+                client.errored do |msg|
+                  logger.warn "Optic agent error: #{msg}"
+                  EventMachine.stop
+                  # TODO stop worker?
+                end
+
+                client.subscribed do
+                  logger.debug "Optic agent subscribed"
+                end
+
+                client.pinged do |msg|
+                  logger.debug "Optic agent pinged: #{msg}"
+                end
+
+                # called whenever a message is received from the server
+                client.received do |message|
+                  logger.debug "Optic agent received: #{message}"
+                  command = message["message"]["command"]
+
+                  case command
+                  when "request_schema"
+                    logger.debug "Optic agent got schema request"
+                    client.perform "schema", message: Optic::Rails.get_entities
+                    logger.debug "Optic agent sent schema"
+                  when "request_metrics"
+                    logger.debug "Optic agent got metrics request"
+                    client.perform "metrics", message: Optic::Rails.get_metrics(message["message"]["pivot"])
+                    logger.debug "Optic agent sent metrics"
+                  else
+                    logger.warn "Optic agent got unknown command: #{command}"
+                  end
+                end
               end
+
+              logger.warn "Stopping worker thread"
             end
+
+            begin
+              worker.join
+            rescue => e
+              logger.error "Worker thread died with error", e
+            end
+
+            logger.warn "Supervisor thread detected dead worker, sleeping"
+            sleep 5.0
+            logger.debug "Supervisor thread done sleeping"
           end
         end
       end

data/lib/optic/rails/version.rb

@@ -1,5 +1,5 @@
 module Optic
   module Rails
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: optic-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Anton Vaynshtok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: action_cable_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement