netuitived 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa3a5a846491d6a0b5bc5a373e5f5c1b1e738afa
-  data.tar.gz: ca4fd22a0d37a5764449327511f24c7775daae46
+  metadata.gz: 056b8a4954f8939a44f70aa80713dd1cff4b0649
+  data.tar.gz: 61138cad5231443e3946b7300da0399e3e189350
 SHA512:
-  metadata.gz: c23bbbab242dab1b1524be57bd35b06b2f440f671805909f4a1c7fbdb4e6ec90b21d7092e043a13d83262713f9409ff16ca8364c66bf11929d68c27db6ad3066
-  data.tar.gz: f5d11d4fb379eba906ca2204dce4c74fa7a1f5efc36a79bd40fbfe366fb150c31073480991f63e4e7cb31539586cea7122e049c76cc6ada861a3f04a0da6b7af
+  metadata.gz: 552f6551d9f13347adef3491fcb96dff51629bf3fd2f626c4d5a6173e063aeacb17bcd11804400d901f9acc7d8b53b7ef8cac2f20eb683a312d56bb8f166bab0
+  data.tar.gz: 0e62a18b0075c13752a88ed89cc1ef8793ef938c951e7fedeb20905b2d108825166d78fb7b55b1a33c82ee114cee42ec5503ca686bfb9582f1c30ff493ece6b6

data/lib/netuitive/api_emissary.rb

@@ -2,16 +2,21 @@ require 'net/http'
 require 'json'
 require 'netuitive/netuitived_config_manager'
 class APIEmissary
-	def sendElements(elements)
+	def sendElements(elementString)
 		if ConfigManager.isDebug?
-			puts elements.to_json
+			puts elementString
 		end
 		req = Net::HTTP::Post.new("/ingest/#{ConfigManager.apiId}", initheader = {'Content-Type' =>'application/json'})
-		req.body = elements.to_json
+		req.body = elementString
 		if ConfigManager.isDebug?
 			puts  "starting post"
 		end
-		response = Net::HTTP.start("#{ConfigManager.baseAddr}", ConfigManager.port, :use_ssl => true) do |http|
+		if ConfigManager.port =~ /(.*)nil(.*)/
+			port = nil
+		else
+			port = ConfigManager.port.to_int
+		end
+		response = Net::HTTP.start("#{ConfigManager.baseAddr}", port, :use_ssl => true, :read_timeout => 30, :open_timeout => 30) do |http|
 			http.verify_mode = OpenSSL::SSL::VERIFY_NONE
 			http.ssl_version = :SSLv3
 			http.request req

data/lib/netuitive/metric_aggregator.rb

@@ -15,6 +15,7 @@ class MetricAggregator
 	end
 
 	def sendMetrics()
+		elementString=nil
 		@metricMutex.synchronize{
 			if ConfigManager.isDebug?
 				puts "self: #{self.object_id}" 
@@ -38,9 +39,10 @@ class MetricAggregator
 			end
 			element=IngestElement.new(ConfigManager.elementName, ConfigManager.elementName, "custom", nil, @metrics, @samples+aggregatedSamplesArray, nil, nil)
 			elements= [element]
-			@apiEmissary.sendElements(elements)
+			elementString=elements.to_json
 			clearMetrics
 		}
+		@apiEmissary.sendElements(elementString)
 	end
 
 	def addSample(metricId, val)

data/lib/netuitive/scheduler.rb

@@ -5,7 +5,9 @@ class Scheduler
 		Thread.new do
   			while true do
   				sleep(ConfigManager.interval)
-    			FRONT_OBJECT.sendMetrics
+  				Thread.new do
+    				FRONT_OBJECT.sendMetrics
+    			end
   			end
 		end
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netuitived
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - John King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies: []
 description: Collects metrics over a certain interval and then sends them to Netuitive
 email: jking@netuitive.com
@@ -41,7 +41,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="