netuitived 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 271aaf503bc348eb7535765a23b5eab9ea281c42
-  data.tar.gz: 027dfde32ce851a332d10551aabe18f8a9f8ac27
+  metadata.gz: ac2b7bfed2a40b9ec18f5420fd39223e6a7afe48
+  data.tar.gz: 7952f0f92d29b854eb2a63b84836bae082d8c53a
 SHA512:
-  metadata.gz: 03268b422fd9e8a5f9df25efb5f60b2c764c3c6b4d4960e8db733b35c40cd28ec686949fb19d059866ab0963e861100cfa0632dc60b37e76f346c19a26bdd163
-  data.tar.gz: 84207609a064ae447dd14b6c3a3e40eb9503d6e1fcc1b2a60e4036c2d5d514407dfcce6b7101d0c19cd8e25faf56c952d2d15b0226dfd5ca746827d70f157924
+  metadata.gz: 207c210cc103b5f149ebb770c82ddacbaa317b60c63aa84f3c934a348a3e69571ea9bcb6ce60692f776bc36e1009c94c9265c37dd397297d4f9c7e28d7ff3b35
+  data.tar.gz: 81477f558acdd8395dc5ae62e5ce85fc1469c3fb19d7e800e7a38ac6908c04919c60f5fbcae4477f3d0ff198a5d391d57fcf6d5da5a038daf9d96056f91088c6

data/bin/netuitived

@@ -27,6 +27,17 @@ if ARGV[0] == "start"
 	if written
 		File.open("#{gem_root}/config/agent.yml", 'w') {|f| f.write data.to_yaml } 
 	end
+	require 'drb/drb'
+	netuitivedAddr=data["netuitivedAddr"]
+	netuitivedPort=data["netuitivedPort"]
+	SERVER_URI="druby://#{netuitivedAddr}:#{netuitivedPort}"
+	DRb.start_service
+	begin
+		DRbObject.new_with_uri(SERVER_URI).stopServer
+		sleep(2)
+	rescue
+		
+	end
     require 'netuitived'
 elsif ARGV[0] == "stop"
 	require 'drb/drb'
@@ -34,7 +45,11 @@ elsif ARGV[0] == "stop"
 	netuitivedPort=data["netuitivedPort"]
 	SERVER_URI="druby://#{netuitivedAddr}:#{netuitivedPort}"
 	DRb.start_service
-	DRbObject.new_with_uri(SERVER_URI).stopServer
+	begin
+		DRbObject.new_with_uri(SERVER_URI).stopServer
+	rescue
+		puts "netuitived isn't running"
+	end
 else
     puts "invalid option. options are: start, stop"
 end

data/lib/netuitive/metric_aggregator.rb

@@ -52,6 +52,14 @@ class MetricAggregator
 			NetuitiveLogger.log.debug "aggregatedSamples id: #{@aggregatedSamples.object_id}"
 			NetuitiveLogger.log.debug "metrics before add: #{@metrics.count}"
 			NetuitiveLogger.log.debug "samples before add: #{@aggregatedSamples.count + @samples.count}"
+			if metricId == nil
+				NetuitiveLogger.log.info "null metricId for addSample"
+				return false
+			end
+			if val == nil
+				NetuitiveLogger.log.info "null value for addSample for metricId #{metricId}"
+				return false
+			end
 			if not metricExists metricId
 				NetuitiveLogger.log.info "adding new metric: #{metricId}"
 				@metrics.push(IngestMetric.new(metricId, metricId, nil, "custom", nil, false))
@@ -83,11 +91,23 @@ class MetricAggregator
 			NetuitiveLogger.log.debug "aggregatedSamples id: #{@aggregatedSamples.object_id}"
 			NetuitiveLogger.log.debug "metrics before aggregate: #{@metrics.count}"
 			NetuitiveLogger.log.debug "samples before aggregate: #{@aggregatedSamples.count + @samples.count}"
+			if metricId == nil
+				NetuitiveLogger.log.info "null metricId for aggregateMetric"
+				return false
+			end
+			if val == nil
+				NetuitiveLogger.log.info "null value for aggregateMetric for metricId #{metricId}"
+				return false
+			end
 			if not metricExists metricId
 				NetuitiveLogger.log.info "adding new metric: #{metricId}"
 				@metrics.push(IngestMetric.new(metricId, metricId, nil, "custom", nil, false))
 				@aggregatedSamples["#{metricId}"]=IngestSample.new(metricId, Time.new, val, nil, nil, nil, nil, nil)
 			else
+				if @aggregatedSamples["#{metricId}"] == nil 
+					NetuitiveLogger.log.info "cannot aggregate metric #{metricId} that already has samples for this interval"
+					return false
+				end
 				previousVal = @aggregatedSamples["#{metricId}"].val
 				@aggregatedSamples["#{metricId}"].val+=val
 				NetuitiveLogger.log.info "netuitive sample aggregated #{metricId} old val: #{previousVal} new val: #{@aggregatedSamples["#{metricId}"].val}"

data/lib/netuitive/netuitived_logger.rb

@@ -1,4 +1,14 @@
 require 'logger'
+class CheaterLogger
+	attr_accessor :level
+	def debug(message)
+	end
+	def error(message)
+	end
+	def info(message)
+	end
+end
+
 class NetuitiveLogger
 	begin
 		@@log = Logger.new("#{File.expand_path("../../..", __FILE__)}/log/netuitive.log",'daily', 10)
@@ -11,13 +21,4 @@ class NetuitiveLogger
 			return @@log
 		end
 	end
-end
-
-class CheaterLogger
-	def debug(message)
-	end
-	def error(message)
-	end
-	def info(message)
-	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netuitived
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - John King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies: []
 description: Collects metrics over a certain interval and then sends them to Netuitive
 email: jking@netuitive.com