Merge pull request #1192 from fluent/update-serverengine-related-code

fix code depending ServerEngine 2.0
fluent · Aug 30, 2016 · cd6c71a · cd6c71a
2 parents 31f34c3 + 37fb0a4
commit cd6c71a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/fluentd.gemspec b/fluentd.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency("json", [">= 1.4.3"])
   gem.add_runtime_dependency("yajl-ruby", ["~> 1.0"])
   gem.add_runtime_dependency("cool.io", [">= 1.4.3", "< 2.0.0"])
-  gem.add_runtime_dependency("serverengine", ["= 2.0.0pre2"])
+  gem.add_runtime_dependency("serverengine", ["~> 2.0"])
   gem.add_runtime_dependency("http_parser.rb", [">= 0.5.1", "< 0.7.0"])
   gem.add_runtime_dependency("sigdump", ["~> 0.2.2"])
   gem.add_runtime_dependency("tzinfo", [">= 1.0.0"])

diff --git a/lib/fluent/supervisor.rb b/lib/fluent/supervisor.rb
@@ -307,8 +307,8 @@ def init
         if @path && @path != "-"
           @io = File.open(@path, "a")
           if @chuser || @chgroup
-            chuid = @chuser ? ServerEngine::Daemon.get_etc_passwd(@chuser).uid : nil
-            chgid = @chgroup ? ServerEngine::Daemon.get_etc_group(@chgroup).gid : nil
+            chuid = @chuser ? ServerEngine::Privilege.get_etc_passwd(@chuser).uid : nil
+            chgid = @chgroup ? ServerEngine::Privilege.get_etc_group(@chgroup).gid : nil
             File.chown(chuid, chgid, @path)
           end
         else