fluentd 0.10.35 → 0.10.36

data/lib/fluent/supervisor.rb

@@ -68,6 +68,7 @@ class Supervisor
     @plugin_dirs = opt[:plugin_dirs]
     @inline_config = opt[:inline_config]
     @suppress_interval = opt[:suppress_interval]
+    @dry_run = opt[:dry_run]
 
     @log = LoggerInitializer.new(@log_path, @log_level, @chuser, @chgroup)
     @finished = false
@@ -78,6 +79,7 @@ class Supervisor
     require 'fluent/load'
     @log.init
 
+    dry_run if @dry_run
     start_daemonize if @daemonize
     install_supervisor_signal_handlers
     until @finished
@@ -96,6 +98,19 @@ class Supervisor
   end
 
   private
+
+  def dry_run
+    read_config
+    change_privilege
+    init_engine
+    install_main_process_signal_handlers
+    run_configure
+    exit 0
+  rescue => e
+    $log.error "Dry run failed: #{e}"
+    exit 1
+  end
+
   def start_daemonize
     @wait_daemonize_pipe_r, @wait_daemonize_pipe_w = IO.pipe
 

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.35'
+VERSION = '0.10.36'
 
 end

data/test/plugin/in_stream.rb

@@ -134,6 +134,7 @@ class UnixInputTest < Test::Unit::TestCase
 
   CONFIG = %[
     path #{TMP_DIR}/unix
+    backlog 1000
   ]
 
   def create_driver(conf=CONFIG)
@@ -143,6 +144,7 @@ class UnixInputTest < Test::Unit::TestCase
   def test_configure
     d = create_driver
     assert_equal "#{TMP_DIR}/unix", d.instance.path
+    assert_equal 1000, d.instance.backlog
   end
 
   def connect

data/test/plugin/out_file.rb

@@ -9,7 +9,8 @@ class FileOutputTest < Test::Unit::TestCase
     FileUtils.mkdir_p(TMP_DIR)
   end
 
-  TMP_DIR = File.dirname(__FILE__) + "/../tmp"
+  TMP_DIR = File.expand_path(File.dirname(__FILE__) + "/../tmp")
+  SYMLINK_PATH = File.expand_path("#{TMP_DIR}/current")
 
   CONFIG = %[
     path #{TMP_DIR}/out_file_test
@@ -78,5 +79,22 @@ class FileOutputTest < Test::Unit::TestCase
     path = d.run
     assert_equal "#{TMP_DIR}/out_file_test._2.log.gz", path
   end
+
+  def test_write_with_symlink
+    d = create_driver(CONFIG + %[
+      symlink_path #{SYMLINK_PATH}
+    ])
+    symlink_path = "#{SYMLINK_PATH}.gz"
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    d.emit({"a"=>1}, time)
+
+    # FileOutput#write returns path
+    path = d.run
+    assert File.exists?(symlink_path)
+    assert File.symlink?(symlink_path)
+  ensure
+    FileUtils.rm_rf(symlink_path)
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.35
+  version: 0.10.36
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -96,7 +96,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +183,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - AUTHORS
 - COPYING
 - ChangeLog
@@ -286,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 748399488166287607
+      hash: 1938960347567989865
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23