telemetry 1.3.9 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f66a46f50d1cfd3fe40472b34a51c803c33fa5a7
-  data.tar.gz: 496ba49e4aeb15dc53f23eadaf14454813a84444
+  metadata.gz: f909b582e2a38ba2ff587a7086f2da0f591f06c1
+  data.tar.gz: e0580f90598446e0382b48f59a1d3918cc878e49
 SHA512:
-  metadata.gz: c95aef29ac5f645fd291fa3d3fa0714542f1a0e0150ab12c5875039b1730b628494e7de10ea144f6da2b2eebc9cbbb07b0eae8cf2d1de1dbfd9e2356820df419
-  data.tar.gz: 68ae3c692334fac0bbb1116dbcd1264ffd34cda09bee656dd8afedc2cd96ef343b881f97a38e380c9811d2b97cd51d277735c5b99e13ad1abfc6d25949f293f9
+  metadata.gz: c6cc0c9d27fce5739e05d584682c8c6d484780a0b178d16901a91bfe47221de2e46d866a967b95526626c6fec5fc5d7a706f258aa0db7527b88f4920cb722b7c
+  data.tar.gz: 156f530fb37ed5fabc4790e6a23b775c840340508079b4ab9ff09fc2e2d63a8805dd82c7c3e696b2dffb2eb0b0534741667295072ef6bfdbc33b002792abbd61

data/bin/telemetryd

@@ -18,6 +18,9 @@ runner.with_options do |opts|
   opts.on("-o", "--once", "Run once") do |o|
     options[:once] = o
   end
+  opts.on("-b", "--debug", "Debug") do |o|
+    Telemetry::logger.level = Logger::DEBUG
+  end
 end
 
 runner.execute do |opts|

data/lib/telemetry/api.rb

@@ -21,7 +21,7 @@ module Telemetry
 			if ENV["RACK_ENV"] == 'development'
 				@api_host = "https://api.telemetryapp.com"				
 			elsif ENV["RACK_ENV"] == 'test'
-				@api_host = "https://api.telemetryapp.com"
+				@api_host = "https://qa-api.telemetryapp.com"
 			elsif ENV["RACK_ENV"] == 'qa'
 				@api_host = "https://qa-api.telemetryapp.com"
 			else
@@ -168,6 +168,8 @@ module Telemetry
 		def self.send(method, endpoint, data = nil)
 
 			http = Net::HTTP::Persistent.new 'telemetry_api'
+			http.idle_timeout = 15
+			http.max_requests = 100
 			uri = URI("#{Telemetry.api_host}#{endpoint}")
 
 			Telemetry::logger.debug "REQ #{uri} - #{MultiJson.dump(data)}"
@@ -202,89 +204,107 @@ module Telemetry
 				code = response.code
 
 				Telemetry::logger.debug "RESP (#{((Time.now-start_time)*1000).to_i}ms): #{response.code}:#{response.body}"
+				result = Telemetry::Api.parse_response(response)
 
 				case response.code
 				when "200"
-					rj = MultiJson.load(response.body)
-          Telemetry::logger.info "Updated: #{rj['updated'].join(', ')}" if rj.is_a?(Hash) && rj['updated'] && rj['updated'].is_a?(Array) && rj['updated'].count > 0
-          Telemetry::logger.info "Skipped: #{rj['skipped'].join(', ')}" if rj.is_a?(Hash) && rj['skipped'] && rj['skipped'].is_a?(Array) && rj['skipped'].count > 0
-          Telemetry::logger.info "Errors: #{rj['errors'].join(', ')}" if rj.is_a?(Hash) && rj['errors'] && rj['errors'].is_a?(Array) && rj['errors'].count > 0
-					return rj
+					Telemetry::logger.debug "200 OK"
+					return result
 				when "201"
-					rj = MultiJson.load(response.body)
-          Telemetry::logger.info "Updated: #{rj['updated'].join(', ')}" if rj.is_a?(Hash) && rj['updated'] && rj['updated'].is_a?(Array) && rj['updated'].count > 0
-          Telemetry::logger.info "Skipped: #{rj['skipped'].join(', ')}" if rj.is_a?(Hash) && rj['skipped'] && rj['skipped'].is_a?(Array) && rj['skipped'].count > 0
-          Telemetry::logger.info "Errors: #{rj['errors'].join(', ')}" if rj.is_a?(Hash) && rj['errors'] && rj['errors'].is_a?(Array) && rj['errors'].count > 0
-					return rj
+					Telemetry::logger.debug "201 OK"
+					return result
 				when "204"
+					Telemetry::logger.debug "204 OK"
 					return "No Body"
 				when "400"
-					json = MultiJson.load(response.body)
-					error = "#{Time.now} (HTTP 400) #{json['errors'].join(',') if json && json['errors']}"
-					Telemetry::logger.debug response.body
+					error = "HTTP 400: Request error"
 					Telemetry::logger.error error
 					raise Telemetry::FormatError, error
 				when "401"
 					if Telemetry.token == nil
-						error = "#{Time.now} (HTTP 401): Authentication failed, please set Telemetry.token to your API Token. #{method.upcase} #{uri}"
+						error = "HTTP 401: Authentication failed, please set Telemetry.token to your API Token. #{method.upcase} #{uri}"
 						Telemetry::logger.error error
 						raise Telemetry::AuthenticationFailed, error
 					else
-						error = "#{Time.now} (HTTP 401): Authentication failed, please verify your token. #{method.upcase} #{uri}"
+						error = "HTTP 401: Authentication failed, please verify your token. #{method.upcase} #{uri}"
 						Telemetry::logger.error error
 						raise Telemetry::AuthenticationFailed, error
 					end
 				when "403"
-					error = "#{Time.now} (HTTP 403): Authorization failed, please check your account access. #{method.upcase} #{uri}"
+					error = "HTTP 403: Authorization failed, please check your account access. #{method.upcase} #{uri}"
 					Telemetry::logger.error error
 					raise Telemetry::AuthorizationError, error
 				when "404"
-					error = "#{Time.now} (HTTP 404): Requested object not found. #{method.upcase} #{uri}"
+					error = "HTTP 404: Requested object not found. #{method.upcase} #{uri}"
 					Telemetry::logger.error error
 					raise Telemetry::FlowNotFound, error
 				when "405"
-					error = "#{Time.now} (HTTP 405): Method not allowed. #{method.upcase} #{uri}"
+					error = "HTTP 405: Method not allowed. #{method.upcase} #{uri}"
 					Telemetry::logger.error error
 					raise Telemetry::MethodNotAllowed, error
 				when "429"
-					error = "#{Time.now} (HTTP 429): Rate limited. Please reduce your update interval. #{method.upcase} #{uri}"
+					error = "HTTP 429: Rate limited. Please reduce your update interval. #{method.upcase} #{uri}"
 					Telemetry::logger.error error
 					raise Telemetry::RateLimited, error
 				when "500"
-					error = "#{Time.now} (HTTP 500): API server error. #{method.upcase} #{uri}"
+					error = "HTTP 500: API server error. #{method.upcase} #{uri}"
 					Telemetry::logger.error error
 					Telemetry::logger.error response.body
 					raise Telemetry::ServerException, error
 				when "502"
-					error = "#{Time.now} (HTTP 502): API server is down. #{method.upcase} #{uri}"
+					error = "HTTP 502: API server is down. #{method.upcase} #{uri}"
 					Telemetry::logger.error error
 					raise Telemetry::Unavailable, error
 				when "503"
-					error = "#{Time.now} (HTTP 503): API server is down. #{method.upcase} #{uri}"
+					error = "HTTP 503: API server is down. #{method.upcase} #{uri}"
 					Telemetry::logger.error error
 					raise Telemetry::Unavailable, error
 				else
-					error = "#{Time.now} ERROR UNK: #{method.upcase} #{uri} #{response.body}."
+					error = "ERROR UNK: #{method.upcase} #{uri} #{response.body}."
 					raise Telemetry::UnknownError, error
 				end
 
 			rescue Errno::ETIMEDOUT => e
-				error = "#{Time.now} ERROR #{e}"
+				error = "ERROR #{e}"
 				Telemetry::logger.error error
 				raise Telemetry::ConnectionError, error
 
 			rescue Errno::ECONNREFUSED => e 
-				error = "#{Time.now} ERROR #{e}"
+				error = "ERROR #{e}"
 				Telemetry::logger.error error
 				raise Telemetry::ConnectionError, error
 
 			rescue Exception => e
 				raise e
 
-			ensure
-				http.shutdown
+			#ensure
+				#http.shutdown
 			end
 		end
+
+		def self.parse_response(response)
+			begin
+				resp_hash = MultiJson.load(response.body)
+				return nil unless resp_hash && resp_hash.is_a?(Hash)
+
+				if resp_hash["errors"] && resp_hash["errors"].is_a?(Array) && resp_hash["errors"].count > 0
+					Telemetry::logger.error "Errors: #{resp_hash['errors'].join(', ')}"
+				end
+
+				if resp_hash["updated"] && resp_hash["updated"].is_a?(Array) && resp_hash["updated"].count > 0
+					Telemetry::logger.debug "Updated: #{resp_hash['updated'].join(', ')}"
+				end
+
+				if resp_hash["skipped"] && resp_hash["skipped"].is_a?(Array) && resp_hash["skipped"].count > 0
+					Telemetry::logger.error "Skipped: #{resp_hash['skipped'].join(', ')}"
+				end
+				return resp_hash
+
+			rescue Exception => e
+				return nil
+			end
+		end
+
 	end
 
 	class FormatError < Exception
@@ -321,4 +341,6 @@ module Telemetry
 	end
 
 
+
+
 end

data/lib/telemetry/version.rb

@@ -1,3 +1,3 @@
 module Telemetry
-  TELEMETRY_VERSION = "1.3.9"
+  TELEMETRY_VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telemetry
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
 platform: ruby
 authors:
 - W. Gersham Meharg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj