telemetry 1.1.15 → 1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95925ee7b0d4a631d25365602f7c5731e4198497
-  data.tar.gz: 1e6a00910d6d26a6964da216f412ba903a4ac4bd
+  metadata.gz: 61ce494e39c20a91da002a825fca096cb0f91169
+  data.tar.gz: e7929168331c150d1e12a91d6b84329b0892bc17
 SHA512:
-  metadata.gz: ce1899599b5eda5507fd9f7c7fca12841b622153bfcacdda701d8abb4fb21832fc89b957f2ae59328d2c272a50726f750aa5fc9abf8e8a9b88399fdf4e6b8119
-  data.tar.gz: 1f83affc0e23945b6bf92ea347cc3b49fa06ea7a2d2053d212b4f258b4dad9dbcf3ca7fb474b07b9a5f49e15fb9155a77da2820ed67362ba36e6c4d47c2efa24
+  metadata.gz: 82e7cfeb4ab001bac20043cd9c864f766a23dbf7163149d6bc9b2bc756290823cc196c3a3d85f3f0ca65778a57ea3b7b44a46464aec252d4bdbc962dc83086d3
+  data.tar.gz: f78f373ed23e021cf272d591cc192ed456dd6b8e656a1e1c6299db6849efbecd80ecf664a35a0ad269ee87f5681f2c2d50ced45580ffaffd3cfbbc9507bc862f

data/README.md

@@ -50,13 +50,14 @@ For more information see the [affiliate documentation](https://admin.telemetryap
 
 Telemetry also supports a daemon mode where a binary (telemetryd) runs indefintely and loops through a configuration file triggering updates to the API as it goes.
 
-Create a config file on your disk (by default /etc/telemetryd_config.rb).  This file may have ruby code in it,  you may include your own gems, etc.  The file supports two configuration directives "interval" and "api_token".  The interval is how frequently each flow block is executed with the results sent to the server.  Please note if the result from a block is unchanged from the previous execution then it will be sent to the server only once per day. 
+Create a config file on your disk (by default /etc/telemetryd_config.rb).  This file may have ruby code in it,  you may include your own gems, etc.  The file supports three configuration directives "interval", "api_token" and "flows_expire_in".  The interval is how frequently each flow block is executed with the results sent to the server.  The flows_expire_in sets the expiry timout of the flows. If they do not get fresh data before that period of time the board will display and expired logo on their widgets. Please note if the result from a block is unchanged from the previous execution then it will be sent to the server only once per day when flows_expire_in is not set. 
 
 For more details please see our website.
 
 Example simple config:
 
-	interval 5
+	interval 5            
+	flows_expire_in 300
 	api_token "test-api-token"
 
 	gauge "test-flow-gauge" do

data/lib/telemetry/daemon_config_parser.rb

@@ -18,6 +18,11 @@ module TelemetryDaemon
 		@@interval = interval
 	end
 
+  @@flows_expire_in = nil
+	def flows_expire_in(i)
+		@@flows_expire_in = i
+	end
+
 	# Ensure a minimum of 1 second between loops
 	def wait_for_interval_from(timestamp)
 		@@interval ||= 60
@@ -34,9 +39,9 @@ module TelemetryDaemon
  		x.each {|k,v| @@h[k.to_sym] = v}
  	end
 
-  	# Code blocks users can call at the beginning and end of each interval
-  	@@begin_interval = nil
-  	@@end_interval = nil
+  # Code blocks users can call at the beginning and end of each interval
+  @@begin_interval = nil
+  @@end_interval = nil
 
  	def begin_interval(&block)
  		@@begin_interval = block
@@ -177,16 +182,16 @@ module TelemetryDaemon
 				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]}"
 				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)"
+					Telemetry::logger.debug "  - 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
+		    # 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
 				if offset and offset >= 0 and offset <= 86400
 					this_morning = Time.new(now.year, now.month, now.day).to_i
 					time_since_offset = now.to_i - this_morning - offset
@@ -203,11 +208,16 @@ module TelemetryDaemon
 			Telemetry.logger.debug "  + Executing task #{task[0]} #{task[1]}"
 			block.yield
 
-			if @hh == {}
+			if @@h == {}
 				Telemetry.logger.debug "  - Skipping empty task values #{task[0]} #{task[1]}"
 				next
 			end
 
+      # Use global default to set expires_at field if necessary
+			if @@flows_expire_in and not @@h[:expires_at]
+        set expires_at: Time.now.to_i + @@flows_expire_in
+      end
+
 			# Append the variant
 			values = @@h.merge({variant: variant})
 

data/lib/telemetry/version.rb

@@ -1,3 +1,3 @@
 module Telemetry
-  TELEMETRY_VERSION = "1.1.15"
+  TELEMETRY_VERSION = "1.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telemetry
 version: !ruby/object:Gem::Version
-  version: 1.1.15
+  version: 1.1.16
 platform: ruby
 authors:
 - W. Gersham Meharg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj