la_logger 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -0,0 +1,67 @@
+GEM
+  remote: http://ruby.taobao.org/
+  specs:
+    ast (1.1.0)
+    backports (3.3.3)
+    bson (1.9.2)
+    bson_ext (1.9.2)
+      bson (~> 1.9.2)
+    cool.io (1.1.1)
+      iobuffer (>= 1.0.0)
+    diff-lcs (1.2.4)
+    dotenv (0.9.0)
+    fluent-logger (0.4.6)
+      msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
+      yajl-ruby (~> 1.0)
+    fluent-plugin-mongo (0.6.7)
+      fluentd (>= 0.10.7)
+      mongo (>= 1.6.0)
+    fluentd (0.10.38)
+      cool.io (~> 1.1.1)
+      http_parser.rb (~> 0.5.1)
+      json (>= 1.4.3)
+      msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
+      yajl-ruby (~> 1.0)
+    foreman (0.63.0)
+      dotenv (>= 0.7)
+      thor (>= 0.13.6)
+    http_parser.rb (0.5.3)
+    iobuffer (1.1.2)
+    json (1.8.0)
+    mongo (1.9.1)
+      bson (~> 1.9.1)
+    msgpack (0.5.5)
+    parser (2.0.0.pre6)
+      ast (~> 1.1)
+      slop (~> 3.4, >= 3.4.5)
+    powerpack (0.0.6)
+    rainbow (1.1.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    rubocop (0.12.0)
+      backports (~> 3.3.3)
+      parser (~> 2.0.0.pre6)
+      powerpack (~> 0.0.3)
+      rainbow (>= 1.1.4)
+    slop (3.4.6)
+    thor (0.18.1)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bson_ext
+  fluent-logger
+  fluent-plugin-mongo
+  fluentd
+  foreman
+  mongo
+  rspec
+  rubocop

data/README.md

@@ -4,7 +4,7 @@ Require: ruby 1.9.x, fluent-logger (not working on JRuby without modification).
 
 ## Concepts
 
-- Include into any class, expose a singleton logger object and `log_xxx` functions:
+- Initialize a logger object with `label` and log level:
 
     class LoggerUser
       def logger
@@ -13,18 +13,21 @@ Require: ruby 1.9.x, fluent-logger (not working on JRuby without modification).
       end
 
       def logger_this
+        # use warn, error, fatal, ... to log messages with optional
+        # extra information in hash format:
         logger.error('oops! an error happend!', {extra: 'data'})
+
+        # send (post) message using fluent-logger object directly
         logger.post('custom.tag', {custom: 'message'})
       end
     end
 
 - Silently fails-over to `STDOUT` if `ENV['FLUENTD']` not defined.
 
-To use fluentd service, define: `ENV[FLUENTD] = 'localhost:24224'`
-somewhere in your code before use the logger. Default port `24224` is optional.
+To use fluentd service, define: `ENV[FLUENTD] = 'localhost:24224:label'`
+somewhere in your code before use the logger.
 
-You can use an additional `ENV['FLUENTD_TAG']` to initialize default tag for the
-fluent-logger.
+Default port `24224` is optional, `label` is also optional (default is `nil`).
 
 Note: as logger object is wrapped by a singleton class, there is no effect to
 change this setting after logger object has created.
@@ -33,3 +36,17 @@ change this setting after logger object has created.
 
 Imported from ruby's default `Logger::Severity`, namely: `debug, info, warn, error,
 fatal, unknown`.
+
+## Develop or Test
+
+Run `foreman start` to start the `fluentd` server fro test.
+
+## Production
+
+Set up your fluentd conf file, set
+
+    <match lalogger.**>
+
+where `lalogger` equals the tag parts you set in your `ENV['FLUENTD']` variable.
+
+Optionally set `remove_tag_prefix lalogger.` to remove tag from collection names.

data/config/fluent.conf

@@ -18,31 +18,31 @@
 # http://localhost:24220/api/plugins
 # http://localhost:24220/api/plugins?type=TYPE
 # http://localhost:24220/api/plugins?tag=MYTAG
-<source>
-  type monitor_agent
-  port 24220
-</source>
-
+# <source>
+#   type monitor_agent
+#   port 24220
+# </source>
+#
 # Listen DRb for debug
 # <source>
 #   type debug_agent
 #   port 24230
 # </source>
 
-<match la.**>
+<match lalogger.**>
   # plugin type
   type mongo
-  
+
   # mongodb host + port
   host localhost
   port 27017
-  
+
   # mongodb db + collection
-  database lamancha_log 
+  database lalogger_test
   tag_mapped
-  collection default 
-  
-  remove_tag_prefix la.
+  collection default
+
+  remove_tag_prefix lalogger.
 
   # interval
   flush_interval 1s

data/lib/la_logger/version.rb

@@ -2,5 +2,5 @@
 
 # Define version of the module
 module LaLogger
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/la_logger.rb

@@ -19,11 +19,11 @@ class LaLogger
 
     def initialize
       if ENV['FLUENTD']
-        host_, port_ = ENV['FLUENTD'].split ':'
-        host_ ||= 'localhost'
-        port_ ||= 24224
+        host_, port_, tag_ = ENV['FLUENTD'].split ':'
+        host_ = 'localhost' unless host_ and host_.size > 0
+        port_ = 24224 unless port_ and port_.size > 0
         @logger = Fluent::Logger::FluentLogger.new(
-          ENV['FLUENTD_TAG'], host: host_.to_s, port: port_.to_i
+          tag_, host: host_.to_s, port: port_.to_i
         )
       else
         @logger = Fluent::Logger::ConsoleLogger.open($stderr)

data/spec/helpers/mongo_helper.rb

@@ -5,7 +5,7 @@ include Mongo
 
 module MongoHelper
   def db
-    MongoClient.new('localhost', 27017).db('lamancha_log')
+    MongoClient.new('localhost', 27017).db('lalogger_test')
   end
 
   def get_last_logs(col)

data/spec/la_logger_spec.rb

@@ -12,7 +12,7 @@ include MongoHelper
 # first test class
 class UserA
   def logger
-    @logger ||= LaLogger.new('la.user_a', LaLogger::INFO)
+    @logger ||= LaLogger.new('user_a', LaLogger::INFO)
   end
 
   def test_log_error(msg = 'error message from A')
@@ -27,7 +27,7 @@ end
 # second test class
 class UserB
   def logger
-    @logger ||= LaLogger.new('la.user_b')
+    @logger ||= LaLogger.new('user_b')
   end
 
   def test_log_error(msg = 'error message from B')
@@ -50,7 +50,7 @@ describe LaLogger do
 
   describe 'default level' do
     it 'log error messages' do
-      LaLogger.new('la.global').error('error message from global')
+      LaLogger.new('global').error('error message from global')
       has_log('global', 'error', 'error message from global').should be_true
     end
   end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@
 
 require 'rspec'
 
+ENV['FLUENTD'] = 'localhost:24224:lalogger'
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 
 # in spec/spec_helper.rb

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: la_logger
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Huang Wei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluent-logger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,6 +99,7 @@ extra_rdoc_files: []
 files:
 - .rspec
 - Gemfile
+- Gemfile.lock
 - Procfile
 - README.md
 - benchmark/singleton.rb
@@ -99,30 +111,30 @@ files:
 - spec/helpers/mongo_helper.rb
 - spec/la_logger_spec.rb
 - spec/spec_helper.rb
-- tuser.rb
 homepage: https://github.com/7lime/la_logger-gem
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Wrap fluent logger as a singleton object, silently fail-over to STDOUT if
   fluentd service not defined.
 test_files:

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmMzNjQ0YTZhMWFmYTYxMDI3MmUzODYxM2VmNWZiNDFhMjBkZWY3NA==
-  data.tar.gz: !binary |-
-    ZmNiOTRjOGIyODdlYjdmMWI4NjIwMWZiYTJkNGJmNzA3MmVjMGNkMw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NTZhNmZkMmFkMzYzMTliNDMzYmUyNzQyYTg2N2YxN2ZiN2U2MTIzMWE5Nzkz
-    MmM5NmExYjljMTExNWM1YzI0NmY1YjA2NzUwZDVhNTM4ODBjMTk4NmQ0OWUw
-    ZWVmZjEwMzJhOGIyNTE4NmUwODdiMzRhY2Q4ZDYzNTgwYmRmYTU=
-  data.tar.gz: !binary |-
-    YzI2ZTA2YWMyNDdhMjFlM2Q1NGNiNjliMDY1Y2ZkMWYxZWYxMzJkNjFhYTYz
-    YzZmM2VmZjk3ZjAwOTEwYmJhYzVkZDBlNDdiNjE3MThlMDAxMGJmYTQxMDMw
-    MDhiYzY3MmFlYjUxODcyOWRlMjM1ODFkMTI5Yjk5ODc5NWJlYWI=

data/tuser.rb

@@ -1,21 +0,0 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) + '/lib'
-
-require 'la_logger'
-
-LaLogger.logger.post('La', {message: 'La Mon'})
-
-class User
-  include LaLogger
-
-  def say
-    log_error('An error occured.')
-  end
-
-  def say_other
-    logger_init('La Mancha')
-    log_error('Error occured again.')
-  end
-end
-
-User.new.say
-User.new.say_other