telemetry 1.1.6 → 1.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzY1Mzg3NzUwMDQyNzY5MTc2ZmRiMzdiMDRmMDhjMmM2OTM5YjQ4ZQ==
+    OWU5MzRkM2NjNjIzYjhiMDExNjc3MjRkMjc5NjE5ZmMxOGM4MjNlMw==
   data.tar.gz: !binary |-
-    MTAyMzBlYzQxMTVkNTE5NmI2Mzk2YmNiNjM2NGU0Yjc4YmQ3NGYwMw==
+    YzYwNTczYTQ4YjU5YWM3OThkMjdmMzc3NjJhNjhlYzNiN2NjM2M2Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzI2YmQ3MTU3ZTRlNWIzZTMyOTBhYTMwNjQzZmNmYThhMjNhMmNhODlhYmE2
-    YWY3YzEwNTA4NTUzM2UzOTIxZmEzN2JjNTFiZTYxNzkzNzk0ZWExZTVmYjM3
-    OWRmMjQwMDE4ODlkMWRiYTc2MjEyM2QyYWM5NGYyN2FhNTQyYWY=
+    NDkzZjZlYWFhNzhjNzBhOWQ3YTE3MzE3NmI1NmM3N2YyNDI0M2NhY2YzMzFj
+    MTViZDBmYWVhM2IxYTI0NzQzMTk3N2JiYTExYmVjZDI5Y2UwN2IwMjY4YmVh
+    MmE3ZDE2ZjQyMjA4ZmI4Yjc3NzEwOGQ2N2U5MDY2ZDAxNGUxYTA=
   data.tar.gz: !binary |-
-    MjA5ZGE4NTc5NTc5NWQ0ZmVhZjFmMmI3YzAyZDhlMmM0YjdhNmVmYzQ3Yjc0
-    ZGIzOWVkNWU4NTVhMzBhYTc0NDEyMDU2N2Q4YWJjNTQxMGNhZWYwNWZkNjJh
-    ZDJlMTU4ZDgyNjg3OGNhMDhiOWVlYzRiZjE4OWEwMmQ0NGNhNzI=
+    ZDMwMDYxOTlhMTI4NTExMjcxNDNkYTY0NWViYThhM2Q2ZTIzMTQyY2YzZTQx
+    ZmRlMzA0NzMzOGQxOWVhZDBiN2ZmM2JhOWNkMWQwYzJiYjJhMWI0OTFmNmMz
+    OTg2NWU4ZDgwMDNjMTYyMWY1ZmIyMTkyNDBiOGEwNDRmNzIwMGE=

data/bin/telemetryd

@@ -39,10 +39,11 @@ runner.execute do |opts|
 		TelemetryDaemon.run_begin_interval
 		output = TelemetryDaemon.run_scheduled_flow_updates
 
-		Telemetry::logger.debug "Beginning run"
-
 		begin
-			Telemetry::Api.send(:post, "/flows", {:data => output})
+			unless output == {}
+				Telemetry::logger.debug "Beginning run"
+				Telemetry::Api.send(:post, "/flows", {:data => output}) 
+			end
 
 		rescue Telemetry::RateLimited
 			Telemetry::logger.error "Rate limited: sleeping for 3600s"
@@ -64,7 +65,7 @@ runner.execute do |opts|
 
 		exit if opts[:once]
 
-		Telemetry::logger.debug "Pausing"
+		Telemetry::logger.debug "Waiting...\n"
 
 		TelemetryDaemon.run_end_interval
 		TelemetryDaemon.wait_for_interval_from(start_timestamp)

data/lib/telemetry/daemon_config_parser.rb

@@ -171,12 +171,19 @@ module TelemetryDaemon
 			variant, tag, frequency, offset, block = task
 			now = Time.now
 
+
 			# Check whether we should wait an interval before running
 			if frequency > 0 
+				Telemetry::logger.debug "Task #{task[0]} #{task[1]} (every #{task[2]}s)"
 				#Telemetry::logger.debug "Update frequency is #{frequency} now #{Time.now.to_i} next #{@@next_run_at[tag]}"
-				next if @@next_run_at[tag] && @@next_run_at[tag] >= now.to_i
+				if @@next_run_at[tag] && @@next_run_at[tag] > now.to_i
+					puts "  - Not scheduled yet (waiting #{-(now.to_i - @@next_run_at[tag])}s)"
+					next
+				end
 				@@next_run_at[tag] = now.to_i + frequency
 
+				Telemetry::logger.debug "  - Running intermittant task at #{now}"
+
 		        # If an offset is defined then align runtimes to the offset
 		        # How close you can get to the desired offset depends on the global interval. So set it relatively small
 		        # when using this feature
@@ -188,9 +195,12 @@ module TelemetryDaemon
 					@@next_run_at[tag] -= time_since_offset % frequency
 					#Telemetry::logger.debug "#{now.to_i} #{@@next_run_at[tag]}"
 				end
+			else
+				Telemetry::logger.debug "  - Task #{task[0]} #{task[1]}"
 			end
 
 			# Execute the flow
+			Telemetry.logger.debug "  + Executing task #{task[0]} #{task[1]}"
 			block.yield
 
 			next if @hh == {}

data/lib/telemetry/version.rb

@@ -1,3 +1,3 @@
 module Telemetry
-  TELEMETRY_VERSION = "1.1.6"
+  TELEMETRY_VERSION = "1.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telemetry
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - W. Gersham Meharg