vagrant-orchestrate 0.7.0.pre.4 → 0.7.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc39c0db6444e86098e5908f49c4c23596558de9
-  data.tar.gz: 2e4419f8b8506c7fcae39ce4f4d0ae35a1faed98
+  metadata.gz: 59aea228f2a1e4823a9ee37bf871a5fbc145fc66
+  data.tar.gz: 0d6ec5e9e2cd48d03b5eff1ba2788057b2d903a0
 SHA512:
-  metadata.gz: f295399ff5a18ffa724f919542e6958962f435618b43e4bf1b96d770869e7ec8b07e13bcb2bc7cb733b0128aead302935542768d350fa0d835e62dd1cd476ae8
-  data.tar.gz: 72411db2885f12b14e8dca667d785b7fc361f5127bb088da64daa8abc000c6542cbcb54a5f2763d44a899e6f93602709c28672eccebb4e335b93142a96002b63
+  metadata.gz: 7c7d33a483e98f4a749defff7e7e3cf20c7531eceb7ca6686061a6b67a5a51f7d44b0cc9d823b62691e02adabf23cac3f9bddd7cea6c24863b89e785a4ad360f
+  data.tar.gz: a9e96fe08b81ae251a82695e9e2a4251070745c616e6e1c6f7f083516287ba13f925c93ea704c5414c52fce12d4d66d35f647470b487346edf0ffc1a44c5dc77

data/docs/deployment_tracker.md

@@ -85,6 +85,14 @@ Add the following configuration option to your Vagrantfile
 
     config.orchestrate.tracker_host = "http://deploymenttracker.mydomain.com"
 
+## Logging
+
+Each line sent to Vagrant's UI (your console) will be sent to deployment tracker and
+forwarded on to an appropriate log collector. The current implementation is naive and
+creates an HTTP POST request for each line printed to the console. If this is causing
+performance issues with your deployment, you can disable it with:
+
+    config.orchestrate.tracker_logging_enabled = false
 
 ## Initialization
 

data/lib/log4r/outputter/deployment_tracker_outputter.rb

@@ -1,45 +1,28 @@
 require "log4r/outputter/outputter"
 require "time"
-require "thread"
 
 module Log4r
   class DeploymentTrackerOutputter < Outputter
-    FLUSH_SIZE = 25	 				# Number of messages to queue before a flush happens
-    MAX_QUEUE_SIZE = 255		# Maximum number of messages to store before messages are dropped
-
     def initialize(name, hash = {})
       super(name, hash)
       @logger = Log4r::Logger.new("vagrant_orchestrate::log4r::deployment_tracker_outputter")
-      @queue = []
-      @lock = Mutex.new
-    end
-
-    def flush
-      @lock.synchronize do
-        DeploymentTrackerClient::DefaultApi.post_logs(VagrantPlugins::Orchestrate::DEPLOYMENT_ID, @queue)
-        @queue.clear
-      end
-    rescue
-      @logger.warn "Unable to send log messages to deployment-tracker"
     end
 
     private
 
     def canonical_log(event)
-      if @queue.size >= MAX_QUEUE_SIZE
-        @logger.warn("Deployment Tracker Log Outputter queue size at maximum of #{MAX_QUEUE_SIZE}, dropping message")
-        return
-      end
-
       data = {}
       data["type"] = event.fullname
       data["timestamp"] = Time.now.getutc.iso8601
       data["level"] = LNAMES[event.level]
       data["message"] = event.data
 
-      @queue << data
-
-      flush if @queue.size >= FLUSH_SIZE
+      begin
+        id = VagrantPlugins::Orchestrate::DEPLOYMENT_ID
+        DeploymentTrackerClient::DefaultApi.post_logs(id, [data])
+      rescue
+        @logger.warn "Unable to send log messages to deployment-tracker"
+      end
     end
   end
 end

data/lib/vagrant-managed-servers/action/init_deployment_tracker.rb

@@ -24,11 +24,14 @@ module VagrantPlugins
           SwaggerClient::Swagger.configure do |config|
             config.host = host
           end
-          ui = env[:ui]
-          unless ui.logger.outputters.collect(&:name).include?("deployment-tracker")
-            # Make sure that we've hooked the global ui logger as well. We should
-            # see if we can do this earlier in the process to capture more of the output
-            ui.logger.add Log4r::DeploymentTrackerOutputter.new("deployment-tracker")
+
+          if env[:tracker_logging_enabled]
+            ui = env[:ui]
+            unless ui.logger.outputters.collect(&:name).include?("deployment-tracker")
+              # Make sure that we've hooked the global ui logger as well. We should
+              # see if we can do this earlier in the process to capture more of the output
+              ui.logger.add Log4r::DeploymentTrackerOutputter.new("deployment-tracker")
+            end
           end
           @app.call(env)
         end

data/lib/vagrant-managed-servers/action/track_deployment_end.rb

@@ -14,8 +14,6 @@ module VagrantPlugins
           @app.call(env)
         end
 
-        private
-
         def track_deployment_end(host, start, success, ui)
           return unless host
           @logger.debug("Tracking deployment end to #{host}.")
@@ -27,23 +25,11 @@ module VagrantPlugins
                          assert_empty_server_result: true,
                          elapsed_seconds: elapsed_seconds }
           DeploymentTrackerClient::DefaultApi.put_deployment(id, deployment)
-
-          flush_logger ui
         rescue => ex
-          ui.warn("There was an error notifying deployment tracker. Run with --debug for more details.")
+          ui.warn("There was an error notifying deployment tracker. See error log for details.")
           @logger.warn("Error tracking deployment end for deployment #{id}")
           @logger.warn(ex)
         end
-
-        # Since log messages are being buffered, there could be some that
-        # are buffered up to send, but have yet to be delivered. We'll clear
-        # those out now. If there is a problem getting the logs to deployment
-        # tracker, we'll just see the 1 warning message
-        def flush_logger(ui)
-          ui.logger.outputters.each do |outputter|
-            outputter.flush if outputter.respond_to?("flush")
-          end
-        end
       end
     end
   end

data/lib/vagrant-managed-servers/action/track_deployment_start.rb

@@ -33,7 +33,7 @@ module VagrantPlugins
           }
           DeploymentTrackerClient::DefaultApi.post_deployment(id, deployment)
         rescue => ex
-          ui.warn("There was an error notifying deployment tracker. Run with --debug for more details.")
+          ui.warn("There was an error notifying deployment tracker. See error log for details.")
           @logger.warn("Error tracking deployment start for deployment #{id}")
           @logger.warn(ex)
         end

data/lib/vagrant-managed-servers/action/track_server_deployment_end.rb

@@ -28,7 +28,7 @@ module VagrantPlugins
           }
           DeploymentTrackerClient::DefaultApi.put_server(id, server)
         rescue => ex
-          ui.warn("There was an error notifying deployment tracker of server end. Run with --debug for more details.")
+          ui.warn("There was an error notifying deployment tracker of server end. See error log for details.")
           ui.warn(ex.message)
           pp ex
           @logger.warn("Error tracking deployment server end for deployment #{id}")

data/lib/vagrant-managed-servers/action/track_server_deployment_start.rb

@@ -28,7 +28,7 @@ module VagrantPlugins
           }
           DeploymentTrackerClient::DefaultApi.post_server(id, server)
         rescue => ex
-          ui.warn("There was an error notifying deployment tracker of server start. Run with --debug for more details.")
+          ui.warn("There was an error notifying deployment tracker of server start. See error log for details.")
           ui.warn(ex.message)
           @logger.warn("Error tracking deployment server start for deployment #{id}")
           @logger.warn(ex)

data/lib/vagrant-orchestrate/command/push.rb

@@ -73,6 +73,7 @@ module VagrantPlugins
 
           @env.action_runner.run(VagrantPlugins::ManagedServers::Action::InitDeploymentTracker,
                                  tracker_host: @env.vagrantfile.config.orchestrate.tracker_host,
+                                 tracker_logging_enabled: @env.vagrantfile.config.orchestrate.tracker_logging_enabled,
                                  ui: @env.ui)
           @env.action_runner.run(VagrantPlugins::ManagedServers::Action::TrackDeploymentStart,
                                  tracker_host: @env.vagrantfile.config.orchestrate.tracker_host,

data/lib/vagrant-orchestrate/config.rb

@@ -8,6 +8,7 @@ module VagrantPlugins
       attr_accessor :strategy
       attr_accessor :force_push
       attr_accessor :tracker_host
+      attr_accessor :tracker_logging_enabled
       attr_accessor :credentials
 
       def initialize
@@ -15,6 +16,7 @@ module VagrantPlugins
         @strategy = UNSET_VALUE
         @force_push = UNSET_VALUE
         @tracker_host = UNSET_VALUE
+        @tracker_logging_enabled = UNSET_VALUE
         @credentials = Credentials.new
       end
 
@@ -38,16 +40,17 @@ module VagrantPlugins
         end
       end
 
-      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def finalize!
         @filter_managed_commands = false if @filter_managed_commands == UNSET_VALUE
         @strategy = :serial if @strategy == UNSET_VALUE
         @force_push = false if @force_push == UNSET_VALUE
         @tracker_host = nil if @tracker_host == UNSET_VALUE
+        @tracker_logging_enabled = true if @tracker_logging_enabled == UNSET_VALUE
         @credentials = nil if @credentials.unset?
         @credentials.finalize! if @credentials
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       class Credentials
         # Same as Vagrant does to distinguish uninitialized variables and intentional assignments

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.7.0.pre.4"
+    VERSION = "0.7.0.pre.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre.4
+  version: 0.7.0.pre.5
 platform: ruby
 authors:
 - Christopher Baldauf