fluentd 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a5677f5a62821f6d9300f21eddded90ff1f0e0a
-  data.tar.gz: 004b3bb49cd860b6132811b3cf1aa7ef89c4611f
+  metadata.gz: 6767a4f2dc914fc96e7d5f0118632a48727316d3
+  data.tar.gz: 631b3ffc84b275449c26ceff0fe3d26bb0cc8171
 SHA512:
-  metadata.gz: 2aa4d2ef65d85eeb6df07245c6f9459b17d1a8d1546862ad7b96556d413a029dc3fff2514f49ffd1f3f307f11cf117816fcfcf28060f823525a01392c4e342fc
-  data.tar.gz: ff625fbf8a5b70866d413b6c5e5f1b8d4ebb52acf696ee1416de2cd249ff6ca14c223a312d633027f6c21e2e7a95b150abc3a43baa116ab54b55856543375432
+  metadata.gz: f3bfce72a5da88d1698c8820cd3b84452962a8505e3736e9e27ccbe55877e5774cc427bbbd30ed50dfca74bb5d6c2aca4f2a259562aadccb43218300bb15d4d6
+  data.tar.gz: d96782300d9d439b35e836e765a4079d256df8bbce494c63309152416283826fe829ec8384fbab1dc658c9cad2643be0b737307743760e5a86ee455c15236e74

data/ChangeLog

@@ -1,35 +1,56 @@
 # v0.12
 
+## Release 0.12.4 - 2015/01/23
+
+### New features / Enhancement
+
+* Support 64bit inode environment in in_tail
+  https://github.com/fluent/fluentd/pull/542
+
+### Bug fixes
+
+* Fix ThreadError occuring on Signal.trap SIGHUP
+  https://github.com/fluent/fluentd/pull/541
+
 ## Release 0.12.3 - 2015/01/16
 
 ### New features / Enhancement
 
 * parser: nginx and apache2 format can now parse access log without http-version
+  https://github.com/fluent/fluentd/pull/535
 * filter_record_transformer: Allow non-string values like array / hash
+  https://github.com/fluent/fluentd/pull/530
 * plugin: Add writable check for path related parameter
+  https://github.com/fluent/fluentd/pull/401
 * command: -g and -G now works in embedded Ruby environment like Treasure Agent
+  https://github.com/fluent/fluentd/pull/423
 
 ### Bug fixes
 
 * buffer: Fix to flush a buffer by USR1 signal even on retrying
+  https://github.com/fluent/fluentd/pull/531
 * buffer: Fix TimeSlicedOutput doesn't flush with SIGUSR1
+  https://github.com/fluent/fluentd/pull/533
 * buffer: Fix broken calc_retry_wait if Integer is used for retry_wait parameter
+  https://github.com/fluent/fluentd/pull/529
 * engine: Fix SIGHUP does not reload config
+  https://github.com/fluent/fluentd/pull/537
 
 ## Release 0.12.2 - 2014/12/20
 
-### New Features
+### New Features / Enhancement
 
 * filter: Change filter behaviour. If filter method returns nil, its record is removed from stream.
-
-### Enhancement
-
+  https://github.com/fluent/fluentd/pull/515
 * in_monitor_agent: Render filter plugins
+  https://github.com/fluent/fluentd/pull/514
 * test: FilterTestDriver has run, emit and getting result methods
+  https://github.com/fluent/fluentd/pull/519
 
 ### Bug fixes
 
 * test: Support @label by TestDriver
+  https://github.com/fluent/fluentd/pull/517
 
 ## Release 0.12.1 - 2014/12/14
 
@@ -40,7 +61,7 @@
 
 ## Release 0.12.0 - 2014/12/12
 
-### New Features
+### New Features / Enhancement
 
 * config: Introduce @type and @id parameter for system parameter. type and id are still valid.
 * Filter: old tag trick of "using output plugins as filter" is no longer needed
@@ -67,9 +88,6 @@ Here is the announcement for above new features: http://www.fluentd.org/blog/flu
   https://github.com/fluent/fluentd/pull/473
 * output: Add relable output plugin
   https://github.com/fluent/fluentd/pull/417
-
-### Enhancement
-
 * config: Add self.name to configure_proxy error message
   https://github.com/fluent/fluentd/pull/490
 * log: --suppress-repeated-stacktrace is true by default

data/lib/fluent/plugin/in_tail.rb

@@ -597,7 +597,7 @@ module Fluent
         @file.write path
         @file.write "\t"
         seek = @file.pos
-        @file.write "0000000000000000\t00000000\n"
+        @file.write "0000000000000000\t0000000000000000\n"
         @last_pos = @file.pos
 
         @map[path] = FilePositionEntry.new(@file, seek)
@@ -623,12 +623,15 @@ module Fluent
       # Clean up unwatched file entries
       def self.compact(file)
         file.pos = 0
-        existent_entries = file.each_line.select { |line|
+        existent_entries = file.each_line.map { |line|
           m = /^([^\t]+)\t([0-9a-fA-F]+)\t([0-9a-fA-F]+)/.match(line)
           next unless m
+          path = m[1]
           pos = m[2].to_i(16)
-          pos == UNWATCHED_POSITION ? nil : line
-        }
+          ino = m[3].to_i(16)
+          # 32bit inode converted to 64bit at this phase
+          pos == UNWATCHED_POSITION ? nil : ("%s\t%016x\t%016x\n" % [path, pos, ino])
+        }.compact
 
         file.pos = 0
         file.truncate(0)
@@ -637,13 +640,13 @@ module Fluent
     end
 
     # pos               inode
-    # ffffffffffffffff\tffffffff\n
+    # ffffffffffffffff\tffffffffffffffff\n
     class FilePositionEntry
       POS_SIZE = 16
       INO_OFFSET = 17
-      INO_SIZE = 8
-      LN_OFFSET = 25
-      SIZE = 26
+      INO_SIZE = 16
+      LN_OFFSET = 33
+      SIZE = 34
 
       def initialize(file, seek)
         @file = file
@@ -652,7 +655,7 @@ module Fluent
 
       def update(ino, pos)
         @file.pos = @seek
-        @file.write "%016x\t%08x" % [pos, ino]
+        @file.write "%016x\t%016x" % [pos, ino]
       end
 
       def update_pos(pos)
@@ -662,7 +665,7 @@ module Fluent
 
       def read_inode
         @file.pos = @seek + INO_OFFSET
-        raw = @file.read(8)
+        raw = @file.read(16)
         raw ? raw.to_i(16) : 0
       end
 

data/lib/fluent/supervisor.rb

@@ -321,12 +321,16 @@ module Fluent
       trap :HUP do
         $log.debug "fluentd supervisor process get SIGHUP"
         $log.info "restarting"
-        read_config
-        apply_system_config
-        if pid = @main_pid
-          Process.kill(:TERM, pid)
-          # don't resuce Erro::ESRSH here (invalid status)
-        end
+        # Creating new thread due to mutex can't lock
+        # in main thread during trap context
+        Thread.new {
+          read_config
+          apply_system_config
+          if pid = @main_pid
+            Process.kill(:TERM, pid)
+            # don't resuce Erro::ESRSH here (invalid status)
+          end
+        }.run
       end
 
       trap :USR1 do

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.3'
+  VERSION = '0.12.4'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack