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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fcf7bf15fd8a6f5548cd6560224b33f032d3997
-  data.tar.gz: 72d462a74a9ea8b987c24c5e935880dccee1a553
+  metadata.gz: fc39c0db6444e86098e5908f49c4c23596558de9
+  data.tar.gz: 2e4419f8b8506c7fcae39ce4f4d0ae35a1faed98
 SHA512:
-  metadata.gz: 852122e6a8d60d4da843da08be7fd6e756abbd08ccb1694dde272f08400be9429accbf8a2ef4e363f109b92b940daa017d10ef9c73baf553321222ad9b3755f8
-  data.tar.gz: 379944987d3380f3fc3f5a269d895aea5c5328f35deba8f7f314700f47719d9ed8f4d2aafd4bb11213199c20ad23a6935fff67660b8eb714ed710f6780b6775e
+  metadata.gz: f295399ff5a18ffa724f919542e6958962f435618b43e4bf1b96d770869e7ec8b07e13bcb2bc7cb733b0128aead302935542768d350fa0d835e62dd1cd476ae8
+  data.tar.gz: 72411db2885f12b14e8dca667d785b7fc361f5127bb088da64daa8abc000c6542cbcb54a5f2763d44a899e6f93602709c28672eccebb4e335b93142a96002b63

data/lib/log4r/outputter/deployment_tracker_outputter.rb

@@ -1,28 +1,45 @@
 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
 
-      begin
-        id = VagrantPlugins::Orchestrate::DEPLOYMENT_ID
-        DeploymentTrackerClient::DefaultApi.post_logs(id, data)
-      rescue
-        @logger.warn "Unable to send log messages to deployment-tracker"
-      end
+      @queue << data
+
+      flush if @queue.size >= FLUSH_SIZE
     end
   end
 end

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

@@ -14,6 +14,8 @@ 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}.")
@@ -25,11 +27,23 @@ 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. See error log for details.")
+          ui.warn("There was an error notifying deployment tracker. Run with --debug for more 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. See error log for details.")
+          ui.warn("There was an error notifying deployment tracker. Run with --debug for more 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. See error log for details.")
+          ui.warn("There was an error notifying deployment tracker of server end. Run with --debug for more 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. See error log for details.")
+          ui.warn("There was an error notifying deployment tracker of server start. Run with --debug for more details.")
           ui.warn(ex.message)
           @logger.warn("Error tracking deployment server start for deployment #{id}")
           @logger.warn(ex)

data/lib/vagrant-orchestrate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre.3
+  version: 0.7.0.pre.4
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deployment-tracker-client