mojo_logger 0.2.0-java → 0.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1becdf2a946b6a2b50a015999dfc888a51e5be4
-  data.tar.gz: 469dc6e7c51e52ff0adaa40324aa2a2ac7295053
+  metadata.gz: d11d721f03d6f5ec11d8633a6d37319d79be15ec
+  data.tar.gz: 624e65eb57dd6e4e0c4bb9c4ce29e715f1fe91ef
 SHA512:
-  metadata.gz: 3443db7bda39c995c0735dc1c4f17a8090474c32bcf7e970fd4ce0b9ef3eb69af85f58d5e19bf59dd9c5df39b324c32337bea2c8d943b1d3f05f2fc563ab246e
-  data.tar.gz: f78dd6aa6fec19a2dae56d83ace5b1e0f61ef7dd4b7ae6bcd2d11251904efbc3d9aaa9c6ebfb0e3ff725964a9bfbb50a53fe73fbd519c8308ab1c31ab311b7ff
+  metadata.gz: 69371ddc10ef50313b8073926ee17f8786d678e2ca3891c115ce42985dc4874d982f7ba292d16d881b98e76b7f6fdcbb805b70e1801926e998ca6d769b3a7218
+  data.tar.gz: f0c55445392bb65bc30e97aadc48d9b538f1f0db993c58a862cfc3813646cd3daf0d0f6b42497edf8cd8dd581a7fe3cee10e0cc465471327eaf8449f31112f78

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mojo_logger.gemspec
 gemspec
-
-group :test do
-  gem 'rspec'
-end

data/README.md

@@ -28,8 +28,8 @@ Or install it yourself as:
 ```ruby
 require 'mojo_logger'
 
-MojoLogger.logger.debug "This is a message"
-#=> This is a message 
+MojoLogger.debug "This is a message"
+#=> This is a message
 
 ```
 
@@ -74,10 +74,10 @@ MojoLogger.config do |config|
   config.default_log_level = :warn
 end
 
-MojoLogger.logger.debug "This won't show up"
+MojoLogger.debug "This won't show up"
 #=> nil
 
-MojoLogger.logger.warn "This will show up"
+MojoLogger.warn "This will show up"
 #=> This will show up
 
 ```
@@ -109,6 +109,43 @@ end
 
 ```
 
+#### Add Custom adapter for format your logs
+Add an adapter that will accept whatever fields you want to input and output a hash.
+This hash will be converted to json by MojoLogger.
+
+```ruby
+require 'mojo_logger'
+include MojoLogger
+
+ENV['RACK_ENV'] = 'development'
+
+# by default you use the standard adapter
+
+mojo_debug({}, 'category', 'this is my message', { custom: :field })
+# => {"time":"04-01-2016 22:25:33.019 +0000","app":"Mojo","env":"development","session_id":null,"reference_id":null,"api":null,"category":"category","message":"this is my message","custom":"field"}
+
+class CustomLogAdapter
+  # an adapter must repond to #format() and return a Hash
+  def format(message)
+    {
+      'message'     => message,
+      'constant'    => 'Hello!'
+    }
+  end
+end
+
+
+MojoLogger.config do |config|
+  config.adapter = CustomLogAdapter.new
+end
+
+# now you can call the #mojo_* methods with the parameter you define
+
+mojo_debug('my message')
+# => {"time":"04-01-2016 22:26:43.441 +0000","app":"Mojo","env":"development","message":"my message","constant":"Hello!"}
+
+```
+
 
 ## Development
 

data/lib/bench/gen.rb

@@ -0,0 +1,9 @@
+require 'benchmark'
+
+array = (1..1000000).map { rand }
+
+Benchmark.bmbm do |x|
+  x.report("sort!") { array.dup.sort! }
+  x.report("sort")  { array.dup.sort  }
+end
+

data/lib/mojo_logger.rb

@@ -1,5 +1,6 @@
 require_relative 'mojo_logger/version'
 require_relative 'mojo_logger/mojo_logger'
+require_relative 'mojo_logger/default_adapter'
 require_relative 'mojo_logger/configurator'
 require_relative 'mojo_logger/appender'
 

data/lib/mojo_logger/configurator.rb

@@ -4,7 +4,7 @@ module MojoLogger
   class Configurator
     extend Forwardable
 
-    attr_reader :properties_file
+    attr_reader :properties_file, :env
     attr_accessor :application_name
     def_delegators :@default_appender, :pattern, :pattern=
     def_delegators :@default_appender, :max_file_size, :max_file_size=
@@ -16,6 +16,8 @@ module MojoLogger
       @use_default_appender = true
       @appenders = []
       @application_name = "Mojo"
+      @adapter = DefaultAdapter.new
+      @env = ENV['RAILS_ENV'] || ENV['RACK_ENV']
     end
 
     def default_log_level
@@ -53,6 +55,15 @@ module MojoLogger
       properties
     end
 
+
+    def adapter=(adapter)
+      @adapter = adapter
+    end
+
+    def adapter
+      @adapter
+    end
+
     private
 
     def generate_root_logger_line

data/lib/mojo_logger/default_adapter.rb

@@ -0,0 +1,29 @@
+module MojoLogger
+  class DefaultAdapter
+
+    def format(api_request, category, message, options=nil)
+      msg = {
+        'session_id'   => api_request[:session_id],
+        'reference_id' => api_request[:reference_id],
+        'api'          => api_request[:api],
+        'category'     => category,
+        'message'      => message
+      }
+
+      msg.merge!(process_options(options)) if options
+      msg
+    end
+
+    private
+
+    def process_options(options)
+      if options.is_a?(Hash)
+        options
+      else
+        { 'options' => options }
+      end
+    end
+
+  end
+end
+

data/lib/mojo_logger/mojo_logger.rb

@@ -1,9 +1,13 @@
 require 'java'
 require 'time'
 require 'json'
+require 'stringio'
+require 'forwardable'
 require_relative '../jars/log4j-1.2.17.jar'
 
 module MojoLogger
+  extend SingleForwardable
+  def_delegators :logger, :debug, :info, :warn, :error, :fatal
 
   def mojo_debug(*args)
     MojoLogger.mojo_debug(*args)
@@ -31,19 +35,12 @@ module MojoLogger
       @@logger ||= configure_logger
     end
 
-    def mojo_msg(api_request, category, message, options=nil)
+    def mojo_msg(*args)
       msg = {
         'time' => Time.now.utc.strftime("%m-%d-%Y %H:%M:%S.%L %z"),
-        'app' => configurator.application_name,
-        'session_id' => api_request[:session_id],
-        'reference_id' => api_request[:reference_id],
-        'api' => api_request[:api],
-        'category' => category,
-        'message' => message
-      }
-
-      processed_opts = process_options(options)
-      msg.merge!(processed_opts) if processed_opts
+        'app'  => configurator.application_name,
+        'env'  => configurator.env
+      }.merge!(configurator.adapter.format(*args))
 
       msg.to_json
     end

data/lib/mojo_logger/version.rb

@@ -1,3 +1,3 @@
 module MojoLogger
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/mojo_logger.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mojo_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: java
 authors:
 - John Thomas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: pry
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
    This gem is a wrapper around log4j that allow you to
     construct a log4j.properties file from a config block, rather than actually
@@ -72,10 +86,12 @@ files:
 - bin/console
 - bin/setup
 - conf/log4j.properties
+- lib/bench/gen.rb
 - lib/jars/log4j-1.2.17.jar
 - lib/mojo_logger.rb
 - lib/mojo_logger/appender.rb
 - lib/mojo_logger/configurator.rb
+- lib/mojo_logger/default_adapter.rb
 - lib/mojo_logger/mojo_logger.rb
 - lib/mojo_logger/version.rb
 - mojo_logger.gemspec