bamm_log 0.0.6 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDJlNmU4NzcyYTljNTI5MjhiZDJlNDFhMGJmNjUzNWM4YjgwYjlhYw==
+    Yjk3ZDU2MWMxZjJhZTRhYjEwMGEyYmI2MTVmNmQ1ZWNmMzU3ZWNhNg==
   data.tar.gz: !binary |-
-    MDU5MTFkM2NmNjY0ZTc4MjA5ZWYzOTA4NGMwMjg1ZmRiZjMyZDk4YQ==
+    ZGU1YWUxMjBkZTAzYzFkMzNjMTczZjgzMGE4ZjRlNDljNjFiYzBhYQ==
 SHA512:
   metadata.gz: !binary |-
-    NGE3Mzg5OTAyZWJiYzEzNTk4YjhkZTc2ZjIwOTM0YjRkMGU2YzFkYjdjN2Vh
-    MDM3NjcxOGE3OTZlYjYzZTRkMjU4ODZmN2IyZTQ1Zjk2Y2E1Y2IyZDU0ZmQx
-    OGE5NTUxZTFiM2YzM2RmNjA2YjM4MmZiNGEwNmQ3NzliZjA3MjQ=
+    NzAwZmZiNDk4OWY1YzNmODgyMmU4NWJjNDJlMDk2NjMzZGVhYjlmNzgzMjJj
+    ZGU3YzhjMjIzNWM4ZGRlNTQwOWUwYmJhMTBjMGNlMjM5MTZhNGYxY2EwY2Mw
+    OTc4Y2NhM2NiOTI2N2I2Mjg4MGEwN2Q1ZTU2ZTM1NDc4ZjY3OWE=
   data.tar.gz: !binary |-
-    NGJhMDk0ODE0ZjdlYzJiYWRiZTg4Mzc1MDVjY2NkMGUwMzJkZmFjODU3MmM5
-    YmIzNzQ2NDAyMWUwOWRmM2NhNWJiYzU4YzkyZTYxMWMyYTc0NTQyZWI2Zjgz
-    Y2FlM2U4ZmY5YjFmNWUxYjZkMjE2YjhlNTA0OTcyM2E5OWZiMGE=
+    ZmFhOTQ0MzE2YzBlMmZiOGE2MDY2MTRlODJkNTZlM2UzZmI1NzkwY2FjNzRl
+    NDk1MzhiYWU1NWFlOTliZDZlYWE1Mjk3Y2UwYWIxODg0ZTU3ZGQ4YTZjY2Zm
+    OTA3ZmZlNjMzNjAwZGE0OTAwMWNmOGJjYjc1ZWZmYWY3MTEyZmQ=

data/README.md

@@ -55,7 +55,7 @@ Include in your app
 
     class App < Sinatra::Base
 
-      include BammLog::Logger
+      helpers BammLog::Logger
       
     end
     
@@ -64,7 +64,7 @@ And add manual logs
     BammLog.print "This is a log"
 
 
-In development environment, bamm_log logs to your terminal.<br />
+In development environment, bamm_log logs to your terminal. (Right now is just a puts...meh, not really a logger)<br />
 In live environment, training or staging, bamm_log creates a file with the name "environment".log in /log and logs all the accesses and errors from your application.
 
 ## Contributing

data/lib/bamm_log.rb

@@ -3,25 +3,18 @@ require_relative 'bamm_log/formatter'
 require_relative 'bamm_log/version'
 
 module BammLog
+
   module Logger
 
     def self.included(klass)
-      klass.configure do    
-        klass.enable :logging
-        klass.use BammLog::ExceptionMiddleware
-      end
-      
+      klass.use BammLog::ExceptionMiddleware
       klass.include BammLog::Formatter
-      
-      @instance ||= if klass.environment != :development        
+
+      @instance ||= if ENV['RACK_ENV'] != 'development'
         EnvLogger.new(klass)
       else
         DevLogger.new
       end
-
-      klass.configure do
-        klass.use Rack::CommonLogger, BammLog::Logger.instance
-      end
     end
 
     def self.instance
@@ -35,14 +28,14 @@ module BammLog
       attr_accessor :logger
 
       def initialize(app)
-        self.logger = ::Logger.new(EnvLogger.log_file(app)).tap do |logger|
+        @logger = ::Logger.new(EnvLogger.log_file(app)).tap do |logger|
           ::Logger.class_eval { alias :write :'<<' }
           logger.level = ::Logger::INFO
         end
       end
 
       def self.log_file(app)
-        @log_file ||= File.new("#{app.root}/log/#{app.environment}.log", 'a+').tap do |log_file|
+        @log_file ||= File.new("#{ENV['ROOT_PATH']}/log/#{ENV['RACK_ENV']}.log", 'a+').tap do |log_file|
           log_file.sync = true
         end
       end
@@ -58,15 +51,9 @@ module BammLog
       def info(text)
         puts BammLog::Formatter.call_formatted(Time.now, text)
       end
-    
-    end
 
-  end
+    end
 
-  def print(message)
-    BammLog::Logger.instance.info message
   end
-  
-  extend self
 
-end
+end

data/lib/bamm_log/exception_middleware.rb

@@ -1,56 +1,86 @@
 module BammLog
+
   class ExceptionMiddleware
 
-    attr_reader :env
+    attr_reader :env, :request, :logger
 
     def initialize(app, options={})
-      @app  = app
+      @app = app
     end
 
     def call(env)
-      @env = env
-
       begin
+        @request_id = SecureRandom.base64(24).tr('+/=lIO0', 'pqrsxyz')
+        @start_time = Time.now
+        @env = env
+
+        build_request
         log_start
         log_params
-        @app.call(env)
+
+        begin
+          call = @app.call(env)
+          @end_time = Time.now
+          log_end
+          call
+        rescue Exception => e
+          @end_time = Time.now
+          log_exception(e)
+          log_end
+          @app.call(env)
+        end
       rescue Exception => e
-        log_exception
-        @app.call(env)
+        log_exception(e)
       end
     end
 
     private
 
+    def build_request
+      @request = Rack::Request.new(env)
+    end
+
     def request_params
-      if request_body_params?
-        env['rack.request.form_hash']
-      else
-        Rack::Utils.parse_nested_query(env['QUERY_STRING'])
-      end
+      request.params.except(:route_info)
     end
 
     def log_start
-      BammLog.print "Started #{env['REQUEST_METHOD']} \"#{env['REQUEST_URI']}\""
+      print "Started #{env['REQUEST_METHOD']} \"#{env['REQUEST_URI']}\""
     end
 
     def log_params
-      BammLog.print "Parameters: #{request_params.inspect}"
+      print "Parameters: #{request_params.to_hash.inspect}"
     end
 
-    def log_exception
-      e = env['sinatra.error']
+    def log_exception(e)
+      print "Bamm! #{e.class}: #{e.message}"
 
-      BammLog.print "Bamm! #{e.class}: #{e.message}"
-      
       e.backtrace.each do |line|
-        BammLog.print "#{line}"
+        print "#{line}"
       end
     end
 
+    def log_end
+      print "Ended #{env['REQUEST_METHOD']} \"#{env['REQUEST_URI']}\" in #{request_time_ms} ms"
+    end
+
+    def request_time_ms
+      (@end_time-@start_time).round(4)
+    end
+
+    def print(message)
+
+      if ENV['RACK_ENV'] != 'development' && ENV['RACK_ENV'] != 'test'
+        message = "[#{@request_id}] #{message}"
+      end
+
+      BammLog::Logger.instance.info message
+    end
+
     def request_body_params?
       ['POST', 'PUT', 'PATCH'].include? env['REQUEST_METHOD']
     end
 
   end
-end
+
+end

data/lib/bamm_log/formatter.rb

@@ -16,8 +16,8 @@ module BammLog
         end
       end
     end
-  
+
     extend self
 
   end
-end
+end

data/lib/bamm_log/version.rb

@@ -1,3 +1,3 @@
 module BammLog
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bamm_log
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Joaquim Adráz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -30,6 +30,7 @@ files:
 - pkg/bamm_log-0.0.3.gem
 - pkg/bamm_log-0.0.4.gem
 - pkg/bamm_log-0.0.5.gem
+- pkg/bamm_log-0.0.6.gem
 homepage: https://github.com/joaquimadraz/bamm_log
 licenses:
 - MIT