netuitive_rails_agent 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3ae66dcd7a6e3ef12ca9e9c6dd8d2a1ea3cf4f2
-  data.tar.gz: b9c397490b14af33c021945a9a40aaa79c414642
+  metadata.gz: 6589960bb1e14fd41908bcb7503bfe79e71c8e17
+  data.tar.gz: 4841fc9e063a1e9676dc1535030801a00636f700
 SHA512:
-  metadata.gz: 4c771f4154017ebadb436b61633eb446aa0c6bd1f0ab7c01910d19411f2a97e6746f868c615219a6294bf07903ec2e1def5a08ae065d54830c3e0d76a94b6880
-  data.tar.gz: 638a8f083f936ab6d0d0b7caed8423edf4cf712dedf095415fe9fd82b3eb68c62da304d23a362219c4178968a641bddfde0457b69e110263b1d3df73790f3f8b
+  metadata.gz: 585dd597e8ae4aceae385c50bffa5200f46e320204e601001de34addc88c16948940fe14b828c1303adae153eed999e0650abde5fa98698efd20ee1c3c4acd3a
+  data.tar.gz: 8c3d851eeb2464c6e3516e49a42f2313d1ad38ba820274ccd87d6be29d2f7ea1bbd15d9946c4f5429422db918be50d535416484e61448446b26e25477fd184b5

data/config/agent.yml

@@ -1 +1,2 @@
-debugLevel: error #options (in ascending order of debugness) are: error, info, debug
+#all are configurable using environment variables
+debugLevel: error #options (in ascending order of debugness) are: error, info, debug. environment variable: NETUITIVE_RAILS_DEBUG_LEVEL

data/lib/netuitive/action_controller.rb

@@ -1,3 +1,4 @@
+require 'netuitive/netuitive_rails_logger'
 module NetuitiveActionControllerSub
   def self.subscribe
     ActiveSupport::Notifications.subscribe /process_action.action_controller/ do |*args| 
@@ -14,54 +15,42 @@ module NetuitiveActionControllerSub
         NetuitiveRubyAPI::netuitivedServer.addSample("#{controller}.#{action}.request.query_time", event.payload[:db_runtime])
         NetuitiveRubyAPI::netuitivedServer.addSample("#{controller}.#{action}.request.view_time", event.payload[:view_runtime])
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+          NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
     ActiveSupport::Notifications.subscribe /write_fragment.action_controller/ do |*args| 
       begin
         NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.write_fragment", 1)
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+          NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
     ActiveSupport::Notifications.subscribe /read_fragment.action_controller/ do |*args| 
       begin
         NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.read_fragment", 1)
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+          NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
     ActiveSupport::Notifications.subscribe /expire_fragment.action_controller/ do |*args| 
       begin
         NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.expire_fragment", 1)
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+          NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
     ActiveSupport::Notifications.subscribe /write_page.action_controller/ do |*args| 
       begin
         NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.write_page", 1)
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+          NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
     ActiveSupport::Notifications.subscribe /expire_page.action_controller/ do |*args| 
       begin
         NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.expire_page", 1)
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+        NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
     ActiveSupport::Notifications.subscribe /send_file.action_controller/ do |*args| 

data/lib/netuitive/action_mailer.rb

@@ -6,9 +6,7 @@ module NetuitiveActionMailer
       begin
         NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_mailer.#{mailer}.receive", 1)
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+        NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
     ActiveSupport::Notifications.subscribe /deliver.action_mailer/ do |*args| 
@@ -17,9 +15,7 @@ module NetuitiveActionMailer
       begin
         NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_mailer.#{mailer}.deliver", 1)
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+        NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
   end

data/lib/netuitive/action_view.rb

@@ -4,18 +4,14 @@ module NetuitiveActionViewSub
 			begin
 				NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_view.render_template", 1)
 			rescue
-				if ConfigManager.isError?
-					puts "failure to communicate to netuitived"
-				end
+				NetuitiveLogger.log.error "failure to communicate to netuitived"
 			end
 		end
 		ActiveSupport::Notifications.subscribe /render_partial.action_view/ do |*args| 
 			begin
 				NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_view.render_partial", 1)
 			rescue
-				if ConfigManager.isError?
-					puts "failure to communicate to netuitived"
-				end
+				NetuitiveLogger.log.error "failure to communicate to netuitived"
 			end
 		end
 	end

data/lib/netuitive/active_job.rb

@@ -4,18 +4,14 @@ module NetuitiveActiveJobSub
 			begin
 				NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_job.enqueue", 1)
 			rescue
-				if ConfigManager.isError?
-					puts "failure to communicate to netuitived"
-				end
+				NetuitiveLogger.log.error "failure to communicate to netuitived"
 			end
 		end
 		ActiveSupport::Notifications.subscribe /perform.active_job/ do |*args| 
 			begin
 				NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_job.perform", 1)
 			rescue
-				if ConfigManager.isError?
-					puts "failure to communicate to netuitived"
-				end
+				NetuitiveLogger.log.error "failure to communicate to netuitived"
 			end
 		end
 	end

data/lib/netuitive/active_record.rb

@@ -4,9 +4,7 @@ module NetuitiveActiveRecordSub
 			begin
 				NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_record.instantiation", 1)
 			rescue
-				if ConfigManager.isError?
-					puts "failure to communicate to netuitived"
-				end
+				NetuitiveLogger.log.error "failure to communicate to netuitived"
 			end
 		end
 		
@@ -14,9 +12,7 @@ module NetuitiveActiveRecordSub
 			begin
 				NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_record.sql.statement", 1)
 			rescue
-				if ConfigManager.isError?
-					puts "failure to communicate to netuitived"
-				end
+				NetuitiveLogger.log.error "failure to communicate to netuitived"
 			end
 		end
 	end

data/lib/netuitive/active_support.rb

@@ -4,45 +4,35 @@ module NetuitiveActiveSupportSub
       begin
         NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_support.cache_read", 1)
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+        NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
     ActiveSupport::Notifications.subscribe /cache_generate.active_support/ do |*args| 
       begin
         NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_support.cache_generate", 1)
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+        NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
     ActiveSupport::Notifications.subscribe /cache_fetch_hit.active_support/ do |*args| 
       begin
         NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_support.cache_fetch_hit", 1)
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+        NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
     ActiveSupport::Notifications.subscribe /cache_write.active_support/ do |*args| 
       begin
         NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_support.cache_write", 1)
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+        NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
     ActiveSupport::Notifications.subscribe /cache_delete.active_support/ do |*args| 
       begin
         NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_support.cache_delete", 1)
       rescue
-        if ConfigManager.isError?
-          puts "failure to communicate to netuitived"
-        end
+        NetuitiveLogger.log.error "failure to communicate to netuitived"
       end
     end
   end

data/lib/netuitive/netuitive_rails_logger.rb

@@ -0,0 +1,24 @@
+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)
+	rescue
+		puts "netuitive unable to open log file"
+		@@log = CheaterLogger.new
+	end
+	class << self
+		def log
+			return @@log
+		end
+	end
+end

data/lib/netuitive/rails_config_manager.rb

@@ -1,62 +1,29 @@
+require 'netuitive/netuitive_rails_logger'
 class ConfigManager
 
 	class << self
 		def setup()
-			@@error=0
-			@@info=1
-			@@debug=2
 			readConfig()
 		end
 
-		def netuitivedAddr
-			@@netuitivedAddr
-		end
-
-		def netuitivedPort
-			@@netuitivedPort
-		end
-
-		def isDebug?
-			if @@debugLevel >= @@debug
-				return true
-			end
-			return false
-		end
-
-		def isInfo?
-			if @@debugLevel >= @@info
-				return true
-			end
-			return false
-		end
-
-		def isError?
-			if @@debugLevel >= @@error
-				return true
-			end
-			return false
-		end
-
 		def readConfig()
 			gem_root= File.expand_path("../../..", __FILE__)
 			data=YAML.load_file "#{gem_root}/config/agent.yml"
-			debugLevelString=data["debugLevel"]
+			debugLevelString=ENV["NETUITIVE_RAILS_DEBUG_LEVEL"]
+			if(debugLevelString == nil or debugLevelString == "")
+				debugLevelString=data["debugLevel"]
+			end
 			if debugLevelString == "error"
-				@@debugLevel=@@error
+				NetuitiveLogger.log.level = Logger::ERROR
 			elsif debugLevelString == "info"
-				@@debugLevel=@@info
+				NetuitiveLogger.log.level = Logger::INFO
 			elsif debugLevelString == "debug"
-				@@debugLevel=@@debug
+				NetuitiveLogger.log.level = Logger::DEBUG
 			else
-				@@debugLevel=@@error
+				NetuitiveLogger.log.level = Logger::ERROR
 			end
-
-			if isDebug?
-				puts "read config file. Results: 
-				netuitivedAddr: #{@@netuitivedAddr}
-				netuitivedPort: #{@@netuitivedPort}
+			NetuitiveLogger.log.debug "read config file. Results: 
 				debugLevel: #{debugLevelString}"
-			end
 		end
 	end
 end 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netuitive_rails_agent
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - John King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netuitive_ruby_api
@@ -36,10 +36,12 @@ files:
 - lib/netuitive/active_job.rb
 - lib/netuitive/active_record.rb
 - lib/netuitive/active_support.rb
+- lib/netuitive/netuitive_rails_logger.rb
 - lib/netuitive/rails_config_manager.rb
 - lib/netuitive_rails_agent.rb
 - config/agent.yml
 - "./LICENSE"
+- log/netuitive.log
 homepage: http://rubygems.org/gems/netuitive_rails_agent
 licenses:
 - Apache v2.0