ridc 0.0.4 → 0.0.5

data/lib/configuration.rb

@@ -0,0 +1,28 @@
+require 'ostruct'
+
+module Ridc
+	class << self
+		attr_writer :configuration
+
+		def configuration
+			@configuration ||= OpenStruct.new
+		end
+
+		def configure
+      		yield(configuration)
+    	end
+
+		def system_configured?
+			config = Ridc.configuration
+			[
+				config.customer_key,
+  				config.secret_key,
+  				config.host,
+  				config.port,
+  				config.application_id
+
+			].select { |a| a.nil? }.length == 0
+		end
+
+	end
+end

data/lib/configuration_generator.rb

@@ -0,0 +1,25 @@
+require 'rails/generators'
+
+
+module Ridc
+
+class ConfigurationGenerator < Rails::Generators::Base
+	argument :application_token
+
+	desc "This generator creates Rails Intelligence system initializer"
+	def create_configuration_file
+	initializer "rails_intelligence.rb" do
+<<-EOS
+		Ridc.configure do |config|
+  			config.customer_key = "customerKey1"
+  			config.secret_key = "secret1"
+  			config.host = "railsintelligence.com"
+  			config.port = "8080"
+  			config.application_id = "appplication1"
+		end
+EOS
+    end
+	end
+end
+end
+

data/lib/log_reporter.rb

@@ -0,0 +1,21 @@
+require 'rails'
+
+class Ridc::LogReporter
+
+	attr_reader :original
+
+	def initialize(original_logger)
+		@original = original_logger
+	end
+
+	def method_missing(m, *args, &block)  
+		if %w{debug info warn error fatal}.include?(m.to_s)
+			event = {
+				"logger_severity" => m.to_s,
+				"logger_message" => args.join(' ')
+			}
+			Ridc.sender.load(event) if event["logger_message"].to_s.length > 0
+		end
+		@original.send(m, *args, &block)
+	end
+end

data/lib/ridc.rb

@@ -1,24 +1,28 @@
 require 'rails'
 require 'sender'
 require 'exception_reporter'
+require 'log_reporter'
+require 'configuration'
+require 'configuration_generator'
 
 class Ridc::MainRailtie < Rails::Railtie
 
 	initializer "rails_intelligence.configure_rails_initialization" do |app|
+  
+
+		Rails.logger = Ridc::LogReporter.new(Rails.logger)
+
 		ActiveSupport::Notifications.subscribe do |*args|
 			
 			event_payload = ActiveSupport::Notifications::Event.new *args
-			event_session_id = Thread.current["session_id"]
-			event_session_content = Thread.current["session_content"]
+			
 
 			event = { 
 				:event => event_payload,
-				:event_session_id => event_session_id,
-				:event_session_content => event_session_content
 			}
 			Ridc.sender.load(event)
 			# for debugging use: 
-			# Rails.logger.debug(event.to_json)
+			# Rails.logger.original.debug(event.to_json)
 		end
 
 		ActiveSupport.on_load(:action_controller) do
@@ -29,12 +33,10 @@ class Ridc::MainRailtie < Rails::Railtie
        							# for Rails >= 3.2.0
        							"ActionDispatch::DebugExceptions"
        						else
-      							# for Rails < 3.2.0
+        							# for Rails < 3.2.0
       							"ActionDispatch::ShowExceptions"
       						end
-      	app.config.middleware.insert_after middleware_name, "Ridc::ExceptionReporter"
-      	Rails.logger.warn("yeah!")
-      	Rails.logger.warn(app.config.middleware)
+    app.config.middleware.insert_after middleware_name, "Ridc::ExceptionReporter"  	
     end
 
   	module SessionToRailsIntelligenceFilter 

data/lib/sender.rb

@@ -4,24 +4,32 @@ require 'base64'
 require 'openssl'
 require 'digest/sha1'
 require 'socket'
+require 'configuration'
 
 module Ridc
 
   SEND_LOOP_DELAY_S = 1
 
   def Ridc.sender
-    Thread.current[:sender_worker] ||= Sender.new("customerKey1" , "secret1", "railsintelligence.com", 8080)
+      
+    Thread.current[:sender_worker] ||= Sender.new(
+      Ridc.configuration.customer_key , 
+      Ridc.configuration.secret_key, 
+      Ridc.configuration.host, 
+      Ridc.configuration.port, 
+      Ridc.configuration.application_id)
   end
 
   class Sender
 
-    def initialize(customer_key, secret_key, host, port)
+    def initialize(customer_key, secret_key, host, port, application_id)
       @queue = Queue.new
       @worker_mutex = Mutex.new
+      @application_id = application_id
       @customer_key = customer_key
       @secret_key = secret_key
       @host = host
-      @port = port 
+      @port = port.to_s.to_i
       @my_public_ip = my_first_public_ipv4
       @my_private_ip = my_first_private_ipv4
       @my_hostname = Socket.gethostname
@@ -31,9 +39,20 @@ module Ridc
     end
 
     def load(event)
-      Rails.logger.info("loaded")
+      event[:event_session_id] = Thread.current["session_id"]
+      event[:event_session_content] = Thread.current["session_content"]
+      event[:time] = Time.now.utc.to_i
+      body = {
+      "customerKey" => @customer_key,
+      "signature" => sign_with_secret_key(event.to_json),
+      "event" => event,
+      "hostname" => @my_hostname,
+      "public_ip_v4" => @my_public_ip,
+      "private_ip_v4" => @my_private_ip,
+      "environment" => @environment
+      }
       
-      @queue << event
+      @queue << body
       @worker_mutex.synchronize do
         if @sender_started
           check_sender_thread
@@ -54,33 +73,22 @@ module Ridc
 
    def send_all_events
     loop do 
-      event = @queue.pop(true)
-
-      unless event.nil?
-        send(event)
+      body = @queue.pop(true)
+      unless body.nil?
+        send_request(body)
       else
         sleep(SEND_LOOP_DELAY_S)
       end
     end
   end
 
-  def send(event)
-    req = Net::HTTP::Post.new("/events", initheader = {'Content-Type' => 'application/json'})
-
-    Rails.logger.info("sending")
-    body = {
-      "customerKey" => @customer_key,
-      "signature" => sign_with_secret_key(event.to_json),
-      "event" => event,
-      "hostname" => @my_hostname,
-      "public_ip_v4" => @my_public_ip,
-      "private_ip_v4" => @my_private_ip,
-      "environment" => @environment
-      }.to_json
-
-      req.body = body
+  def send_request(body)
+      req = Net::HTTP::Post.new("/events", initheader = {'Content-Type' => 'application/json'})
+      req.body = body.to_json
       response = Net::HTTP.new(@host, @port).start { |http| http.request(req) }
       return response
+  rescue Exception => e 
+      Rails.logger.original.error(e)
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -23,6 +23,9 @@ files:
 - lib/ridc.rb
 - lib/sender.rb
 - lib/exception_reporter.rb
+- lib/log_reporter.rb
+- lib/configuration.rb
+- lib/configuration_generator.rb
 homepage: http://www.railsintelligence.com
 licenses:
 - MIT