tracebin 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e823382bbf674934553df737b9a52652f9081a14
-  data.tar.gz: ab4ac41cead343e9d8068c925113c241340e15a7
+  metadata.gz: 8d11ab424f832624ca57e0fb3fb89ef91f94266c
+  data.tar.gz: cb885677c01a2f4c4a72042aae0d0c54c1148c93
 SHA512:
-  metadata.gz: cdb4d07940b6895511a4866ca1e140502f463f984c074b82524930e493042b1020a7edf02a75e9ca79d21f5da4a53c34eb458b73860266ee0fd3ad049a58439d
-  data.tar.gz: b6d60fd08949816eb22f5273f415d4dfb04266ce25b4e7829bfa00799624690d8c70cd45bdbac37923007f297a3bc02c9af6e769f11ab0111fe15e2e8003f8a4
+  metadata.gz: 4a65c599d300cb4f2b519774a4be78cc04a128961a23ca70a904f278aed37c4ca7a9b993222551f705755045f3b0cb48ea5e17745394c105e1b2931c223a256f
+  data.tar.gz: ce8338418589aa3a034bed548bd5bbd3afbfa98d78a7cfc6343a350d45daebbfc327d0e7360e60d5e89808885f6320e873ee3b231cafdf286b1d4e63b62e0bd0

data/lib/tracebin/agent.rb

@@ -11,41 +11,76 @@ module Tracebin
     class << self
       attr_accessor :config, :storage, :logger
 
-      def start!
-        return if started? || !config.enabled
+      def start_parent_process
+        return if parent_process_started? || !config.enabled
 
-        logger.info "TRACEBIN: Starting Tracebin agent..."
+        logger.info "TRACEBIN: Starting Tracebin parent process..."
+        init_storage
 
         @subscribers = Subscribers.new
         @health_monitor = HealthMonitor.start
         @worker_process_monitor = WorkerProcessMonitor.start
 
-        @reporter = Reporter.new(storage, config, logger)
+        @parent_process_reporter = Reporter.new
+        @parent_process_reporter.start!
 
-        @reporter.start!
-        @started = true
+        @parent_process_started = true
+        logger.info "TRACEBIN: Tracebin parent process started!"
+      rescue => e
+        logger.info "TRACEBIN: Error occurred while trying to start parent process: #{e.message}"
+      end
+
+      def start_child_process
+        return if child_process_started? || !config.enabled
+
+        logger.info "TRACEBIN: Starting Tracebin child process..."
+        init_storage
 
-        logger.info "TRACEBIN: Tracebin agent started!"
+        @child_process_reporter = Reporter.new
+        @child_process_reporter.start!
+
+        @child_process_started = true
+        logger.info "TRACEBIN: Tracebin child process started!"
+      rescue => e
+        logger.info "TRACEBIN: Error occurred while trying to start child process: #{e.message}"
       end
 
-      def stop!
-        return unless started?
+      def stop_parent_process
+        return unless parent_process_started?
 
-        logger.info "TRACEBIN: Shutting down Tracebin agent..."
+        logger.info "TRACEBIN: Shutting down parent process..."
 
         @health_monitor.stop!
         @worker_process_monitor.stop!
-        @reporter.stop!
+        @parent_process_reporter.stop!
+
+        storage.unload
+
+        @parent_process_started = false
+
+        logger.info "TRACEBIN: Parent process stopped!"
+      end
+
+      def stop_child_processes
+        return unless child_process_started?
+
+        logger.info "TRACEBIN: Shutting down child process..."
+
+        @child_process_reporter.stop!
 
         storage.unload
 
-        @started = false
+        @child_process_started = false
+
+        logger.info "TRACEBIN: Child process stopped!"
+      end
 
-        logger.info "TRACEBIN: Tracebin agent stopped!"
+      def parent_process_started?
+        @parent_process_started
       end
 
-      def started?
-        @started
+      def child_process_started?
+        @child_process_started
       end
 
       def init_logger
@@ -69,16 +104,16 @@ module Tracebin
         else Logger::INFO
         end
       end
+
+      def init_storage
+        @storage = ::Tracebin::Storage.new
+      end
     end
 
     def self.logger
       @logger || init_logger
     end
 
-    def self.storage
-      @storage ||= ::Tracebin::Storage.new
-    end
-
     def self.config
       @config ||= Config.new
     end

data/lib/tracebin/config.rb

@@ -6,7 +6,9 @@ module Tracebin
       report_path: 'reports',
       enable_ssl: true,
       ignored_paths: [],
-      enabled: true
+      enabled: true,
+      report_frequency: 60,
+      report_retry_limit: 10
     }.freeze
 
     attr_accessor *(DEFAULTS.keys + [:bin_id])

data/lib/tracebin/initializer.rb

@@ -0,0 +1,20 @@
+module Tracebin
+  module Initializer
+    class << self
+      def start!
+        if forking_server?
+          # This will not work yet.
+          Tracebin::Agent.start!
+        else
+          Tracebin::Agent.start!
+        end
+      end
+
+      private
+
+      def forking_server?
+        defined? ::Puma
+      end
+    end
+  end
+end

data/lib/tracebin/middleware.rb

@@ -1,5 +1,6 @@
 require 'tracebin/timer'
 require 'tracebin/puppet_master'
+# require 'tracebin/initializer'
 
 module Tracebin
   class Middleware
@@ -7,10 +8,11 @@ module Tracebin
 
     def initialize(app)
       @app = app
+
       @config = Tracebin::Agent.config
       @logger = Tracebin::Agent.logger
 
-      start_agent
+      start_agent_parent_process
     end
 
     def call(env)
@@ -18,7 +20,10 @@ module Tracebin
     end
 
     def __call(env)
+      start_agent_child_process
+
       if agent_disabled?(env)
+        @logger.debug "TRACEBIN: Tracebin disabled for this request."
         return @app.call env
       else
         @tracebin_timer = Timer.new
@@ -48,17 +53,19 @@ module Tracebin
       end
     end
 
-    def start_agent
-      Tracebin::Agent.start!
-    rescue => e
-      @logger.warn "TRACEBIN: Failed to start agent: #{e.message}"
+    def start_agent_child_process
+      Tracebin::Agent.start_child_process
+    end
+
+    def start_agent_parent_process
+      Tracebin::Agent.start_parent_process
     end
 
     def agent_disabled?(env)
       path = env['REQUEST_PATH']
       ignored_paths = config.ignored_paths.map { |root| %r{^#{root}} }
 
-      !Tracebin::Agent.started? ||
+      !Tracebin::Agent.child_process_started? ||
         ignored_paths.any? { |root| !!root.match(path) }
     end
   end

data/lib/tracebin/puppet_master.rb

@@ -5,12 +5,10 @@ module Tracebin
   class PuppetMaster
     def initialize(puppet, options = {})
       @puppet = puppet
-      @logger = RequestLogger.new(options[:logger])
       @storage = ::Tracebin::Agent.storage
     end
 
     def process
-      # @logger.display_payload @puppet.payload
       @storage << @puppet.payload
     end
   end

data/lib/tracebin/reporter.rb

@@ -9,6 +9,7 @@ module Tracebin
       @logger = logger
       @config = config
       @storage = storage
+      @retry_limit = config.report_retry_limit
 
       if config.enable_ssl
         require 'net/https'
@@ -24,7 +25,10 @@ module Tracebin
     end
 
     def start!
-      @task = Concurrent::TimerTask.new do
+      freq = config.report_frequency >= 5 ? config.report_frequency : 5
+      @retries = 0
+
+      @task = Concurrent::TimerTask.new execution_interval: freq do
         unless storage.unloaded?
           payload = storage.unload
           res = send_data payload
@@ -71,22 +75,41 @@ module Tracebin
     rescue Exception => e
       logger.warn "TRACEBIN: Exception occurred sending data to the server: #{e.message}"
       logger.debug "TRACEBIN: #{e.backtrace.join("\n\t")}"
-      Tracebin::Agent.stop!
+      stop_all_agent_processes
     end
 
     def handle_response(res, payload)
       case res
       when Net::HTTPSuccess
+        @retries = 0
         logger.info 'TRACEBIN: Successfully sent payload to the server.'
       when Net::HTTPNotFound
         logger.warn 'TRACEBIN: App bin ID not found. Please create a new app bin and add it to the config.'
-        Tracebin::Agent.stop!
+        stop_all_agent_processes
       when Net::HTTPBadRequest
-        logger.warn 'Something went wrong with the server. Please contact us!'
-        Tracebin::Agent.stop!
+        logger.warn 'TRACEBIN: Something went wrong with the server. Please contact us!'
+        stop_all_agent_processes
+      when Net::HTTPRequestTimeout
+        handle_timeout
       else
-        logger.warn 'TRACEBIN: Failed to send data to the server. Will try again in 1 minute.'
+        logger.warn 'TRACEBIN: Failed to send data to the server.'
+        stop_all_agent_processes
+      end
+    end
+
+    def stop_all_agent_processes
+      ::Tracebin::Agent.stop_parent_process
+      ::Tracebin::Agent.stop_child_process
+    end
+
+    def handle_timeout
+      if @retries < @retry_limit
+        logger.info "TRACEBIN: Couldn't contact the server. Will try again in #{config.report_frequency} seconds."
         @storage.add_payload payload
+        @retries += 1
+      else
+        logger.warn "TRACEBIN: Couldn't contact the server. Retry limit reached."
+        stop_all_agent_processes
       end
     end
   end

data/lib/tracebin/version.rb

@@ -1,3 +1,3 @@
 module Tracebin
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracebin
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Tyler Guillen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -109,6 +109,7 @@ files:
 - lib/tracebin/events.rb
 - lib/tracebin/health_monitor.rb
 - lib/tracebin/helpers.rb
+- lib/tracebin/initializer.rb
 - lib/tracebin/logger.rb
 - lib/tracebin/middleware.rb
 - lib/tracebin/patches.rb