fluentd 0.10.56 → 0.10.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15aab20b26be1dd37d9f185c97971a38767f30a6
-  data.tar.gz: 782800a38871c60c45a69a36e96f8577488809fb
+  metadata.gz: 2d8292e66a20b544c4f2f96165479f81573e7ead
+  data.tar.gz: 8ac541d791d8d50454e4050f6c4242da7b85a884
 SHA512:
-  metadata.gz: ed67bd0d60ed78502d18d10920343db5f78cd8b99ba012b1547d3eef1550e49d1bf0456f88cf5ede4e066a03867821007ef1dd65a19a10ddce5f9e4f8478a7d8
-  data.tar.gz: 359d689bc9ec1b8f158759a1b8a876f5b14858d845263a8b2fd32dff39c7edafb408003875dd4089c6a29d1c6bf58be38843c99e17bba1a7ff15d1ccdd90c3c9
+  metadata.gz: b14d9f92215ea493b61825babac41710bef940e0d07f7a4955476f0e831257a3738ea244f84fcf1271011ced7fc0d4a5db20cd2e6759c488110f12ec94dc75d4
+  data.tar.gz: 480aaf1a575d9c0d1153f24a2d1c2c92fa1ff0308664790b9a023c8b55d5bbaabd2b8ed29ec6209f36ebd899b4a087d40e57cff5bc742150f03ea77cd73391a4

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.10.57 - 2014/11/12
+
+* buffer: Make total_queued_chunk_size thread-safe to avoid race condition with in_monitor_agent
+* Add --no-supervisor option to disable the supervisor for supervision tools like runit
+
 Release 0.10.56 - 2014/10/30
 
 * config: Add Fluent::Config::Section#object_id to avoid NoMethodError by object dump tools

data/lib/fluent/buffer.rb

@@ -223,11 +223,15 @@ module Fluent
 
     def total_queued_chunk_size
       total = 0
-      @map.each_value {|c|
-        total += c.size
-      }
-      @queue.each {|c|
-        total += c.size
+      synchronize {
+        @map.each_value {|c|
+          total += c.size
+        }
+        @queue.synchronize {
+          @queue.each {|c|
+            total += c.size
+          }
+        }
       }
       total
     end

data/lib/fluent/command/fluentd.rb

@@ -52,6 +52,10 @@ op.on('-d', '--daemon PIDFILE', "daemonize fluent process") {|s|
   opts[:daemonize] = s
 }
 
+op.on('--no-supervisor', "run without fluent supervisor") {
+  opts[:supervise] = false
+}
+
 op.on('--user USER', "change user") {|s|
   opts[:chuser] = s
 }

data/lib/fluent/supervisor.rb

@@ -90,11 +90,13 @@ module Fluent
         :suppress_repeated_stacktrace => false,
         :without_source => false,
         :use_v1_config => false,
+        :supervise => true,
       }
     end
 
     def initialize(opt)
       @daemonize = opt[:daemonize]
+      @supervise = opt[:supervise]
       @config_path = opt[:config_path]
       @inline_config = opt[:inline_config]
       @use_v1_config = opt[:use_v1_config]
@@ -123,9 +125,24 @@ module Fluent
 
       dry_run if @dry_run
       start_daemonize if @daemonize
-      install_supervisor_signal_handlers
-      until @finished
-        supervise do
+      if @supervise
+        install_supervisor_signal_handlers
+        until @finished
+          supervise do
+            read_config
+            change_privilege
+            init_engine
+            install_main_process_signal_handlers
+            run_configure
+            finish_daemonize if @daemonize
+            run_engine
+            exit 0
+          end
+          $log.error "fluentd main process died unexpectedly. restarting." unless @finished
+        end
+      else
+        $log.info "starting fluentd-#{Fluent::VERSION} without supervision"
+        main_process do
           read_config
           change_privilege
           init_engine
@@ -135,7 +152,6 @@ module Fluent
           run_engine
           exit 0
         end
-        $log.error "fluentd main process died unexpectedly. restarting." unless @finished
       end
     end
 

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-  VERSION = '0.10.56'
+  VERSION = '0.10.57'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.56
+  version: 0.10.57
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack