act-fluent-logger-rails 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49c7cad6095052ab6f4dca79bb16c7972f934f9c
-  data.tar.gz: c8d2acb86f0ba9f2382a65c1764d8682d962e68c
+  metadata.gz: c3620e98091da97133d63c7988fd39d6fead83c5
+  data.tar.gz: e5be5d05fbe18db5facccd4cc6273bba08ba6e6e
 SHA512:
-  metadata.gz: 248af5b9deb0e572dbf81af0137490bc619104ffe9a58173f6631b50c5e368463fbcdf7da151e977e03ac4f267de00504692e975e07d46e650e6cdd002d2d65c
-  data.tar.gz: c021a43337ae59b7db1d5b7cb677eb8da8b3e278ef77e713a62d8c93dbf676050bc4b3883c90728dd53deedd0fa7ea66febdd7c661460dd019490befac03d2ae
+  metadata.gz: 00ff02c7cc4536d5b1abd93184a6f632803ba73f71cb837b4aabd98ae4aa98b98c5e1f941c58f5ea66ada2f3a5e550c3131aaab3a60406a635e4c3f7e0692d99
+  data.tar.gz: 90b97b638e772f40cecfabe7c1de55b5134454b399c8da508a449ec56d8ee6a811d21023b555c3f05270f86c74e7c77a7358b7179195e7a174a2834139d958e2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.0 / Mar 20 2016
+
+* Add severity_key parameter. Is is The key of severity(DEBUG, INFO, WARN, ERROR).
+
 ## 0.1.10 / Dec 23 2015
 
 * flush immediately.

data/README.md

@@ -43,46 +43,52 @@ Don't use config.log_tags.
       fluent_port:   24224
       tag:           'foo'
       messages_type: 'string'
+      severity_key:  'level'     # default severity
     
     test:
       fluent_host:   '127.0.0.1'
       fluent_port:   24224
       tag:           'foo'
       messages_type: 'string'
+      severity_key:  'level'     # default severity
     
     production:
       fluent_host:   '127.0.0.1'
       fluent_port:   24224
       tag:           'foo'
       messages_type: 'string'
+      severity_key:  'level'     # default severity
 
 #### set an environment variable FLUENTD_URL
 
-    http://fluentd.example.com:42442/foo?messages_type=string
-
- * fluent_host: The host name of Fluentd.
- * fluent_port: The port number of Fluentd.
- * tag: The tag of the Fluentd event.
- * messages_type: The type of log messages. 'string' or 'array'.
+    http://fluentd.example.com:42442/foo?messages_type=string&severity_key=level
 
 #### pass a settings object to ActFluentLoggerRails::Logger.new
 
     config.logger = ActFluentLoggerRails::Logger.
       new(settings: {
             host: '127.0.0.1',
-	    port: 24224,
-	    tag: 'foo',
-	    messages_type: 'string'})
+            port: 24224,
+            tag: 'foo',
+            messages_type: 'string',
+            severity_key: 'level'
+          })
 
-If it is 'string', the log messages is a String.
+### Setting
+
+ * fluent_host: The host name of Fluentd.
+ * fluent_port: The port number of Fluentd.
+ * tag: The tag of the Fluentd event.
+ * messages_type: The type of log messages. 'string' or 'array'.
+   If it is 'string', the log messages is a String.
 ```
-2013-01-18T15:04:50+09:00 foo {"messages":"Started GET \"/\" for 127.0.0.1 at 2013-01-18 15:04:49 +0900\nProcessing by TopController#index as HTML\nCompleted 200 OK in 635ms (Views: 479.3ms | ActiveRecord: 39.6ms)"],"level":"INFO"}
+2013-01-18T15:04:50+09:00 foo {"messages":"Started GET \"/\" for 127.0.0.1 at 2013-01-18 15:04:49 +0900\nProcessing by TopController#index as HTML\nCompleted 200 OK in 635ms (Views: 479.3ms | ActiveRecord: 39.6ms)"],"severity":"INFO"}
 ```
    If it is 'array', the log messages is an Array.
 ```
-2013-01-18T15:04:50+09:00 foo {"messages":["Started GET \"/\" for 127.0.0.1 at 2013-01-18 15:04:49 +0900","Processing by TopController#index as HTML","Completed 200 OK in 635ms (Views: 479.3ms | ActiveRecord: 39.6ms)"],"level":"INFO"}
+2013-01-18T15:04:50+09:00 foo {"messages":["Started GET \"/\" for 127.0.0.1 at 2013-01-18 15:04:49 +0900","Processing by TopController#index as HTML","Completed 200 OK in 635ms (Views: 479.3ms | ActiveRecord: 39.6ms)"],"severity":"INFO"}
 ```
-
+ * severity_key: The key of severity(DEBUG, INFO, WARN, ERROR).
 
 You can add any tags at run time.
 

data/lib/act-fluent-logger-rails/logger.rb

@@ -27,6 +27,7 @@ module ActFluentLoggerRails
           host: fluent_config['fluent_host'],
           port: fluent_config['fluent_port'],
           messages_type: fluent_config['messages_type'],
+          severity_key: fluent_config['severity_key'],
         }
       end
 
@@ -46,7 +47,8 @@ module ActFluentLoggerRails
         fluent_host: uri.host,
         fluent_port: uri.port,
         tag: uri.path[1..-1],
-        messages_type: params["messages_type"].try(:first)
+        messages_type: params['messages_type'].try(:first),
+        severity_key: params['severity_key'].try(:first),
       }.stringify_keys
     end
 
@@ -65,6 +67,7 @@ module ActFluentLoggerRails
       host    = options[:host]
       @messages_type = (options[:messages_type] || :array).to_sym
       @tag = options[:tag]
+      @severity_key = (options[:severity_key] || :severity).to_sym
       @flush_immediately = options[:flush_immediately]
       @fluent_logger = ::Fluent::Logger::FluentLogger.new(nil, host: host, port: port)
       @severity = 0
@@ -120,7 +123,7 @@ module ActFluentLoggerRails
                    @messages
                  end
       @map[:messages] = messages
-      @map[:level] = format_severity(@severity)
+      @map[@severity_key] = format_severity(@severity)
       @log_tags.each do |k, v|
         @map[k] = case v
                   when Proc

data/lib/act-fluent-logger-rails/version.rb

@@ -1,3 +1,3 @@
 module ActFluentLoggerRails
-  VERSION = "0.1.10"
+  VERSION = "0.2.0"
 end

data/spec/logger_spec.rb

@@ -57,7 +57,7 @@ EOF
         expect(@my_logger.log).to eq([['foo', {
                                          abc: 'xyz',
                                          messages: ['hello'],
-                                         level: 'INFO',
+                                         severity: 'INFO',
                                          uuid: 'uuid_value',
                                          foo: 'foo_value'
                                        } ]])
@@ -65,7 +65,7 @@ EOF
         logger.tagged([request]) { logger.info('world'); logger.info('bye') }
         expect(@my_logger.log).to eq([['foo', {
                                          messages: ['world', 'bye'],
-                                         level: 'INFO',
+                                         severity: 'INFO',
                                          uuid: 'uuid_value',
                                          foo: 'foo_value'
                                        } ]])
@@ -115,10 +115,40 @@ EOF
         expect(@my_logger.log[0][1][:messages][0]).to eq(x.inspect)
       end
     end
+
+    describe 'severity_key' do
+      describe 'not specified' do
+        it 'severity' do
+          logger.tagged([request]) { logger.info('hello') }
+          expect(@my_logger.log[0][1][:severity]).to eq('INFO')
+        end
+      end
+
+      describe 'severity_key: level' do
+        before do
+          @config_file = Tempfile.new('fluent-logger-config')
+          @config_file.close(false)
+          File.open(@config_file.path, 'w') {|f|
+            f.puts <<EOF
+test:
+  fluent_host: '127.0.0.1'
+  fluent_port: 24224
+  tag:         'foo'
+  severity_key: 'level'  # default severity
+EOF
+          }
+        end
+
+        it 'level' do
+          logger.tagged([request]) { logger.info('hello') }
+          expect(@my_logger.log[0][1][:level]).to eq('INFO')
+        end
+      end
+    end
   end
 
   describe "use ENV['FLUENTD_URL']" do
-    let(:fluentd_url) { "http://fluentd.example.com:42442/hoge?messages_type=string" }
+    let(:fluentd_url) { "http://fluentd.example.com:42442/hoge?messages_type=string&severity_key=level" }
 
     describe ".parse_url" do
       subject { described_class.parse_url(fluentd_url) }
@@ -126,6 +156,7 @@ EOF
       it { expect(subject['fluent_host']).to eq 'fluentd.example.com' }
       it { expect(subject['fluent_port']).to eq 42442 }
       it { expect(subject['messages_type']).to eq 'string' }
+      it { expect(subject['severity_key']).to eq 'level' }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: act-fluent-logger-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - TAHARA Yoshinori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec