Apply feedback from kou on GitHub#3808

Signed-off-by: Fujimoto Seiji <[email protected]>
fujimotos · Jul 1, 2022 · a538b9b · a538b9b
1 parent 6a18e4d
commit a538b9b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/fluent/error.rb b/lib/fluent/error.rb
@@ -28,6 +28,9 @@ def to_s
   class InvalidRootDirectory < UnrecoverableError
   end
 
+  class InvalidLockDirectory < UnrecoverableError
+  end
+
   # For internal use
   class UncatchableError < Exception
   end

diff --git a/lib/fluent/plugin/base.rb b/lib/fluent/plugin/base.rb
@@ -52,9 +52,7 @@ def fluentd_worker_id
       end
 
       def fluentd_lockdir
-        return @_fluentd_lockdir if @_fluentd_lockdir
-        @_fluentd_lockdir = ENV['FLUENTD_LOCKDIR']
-        @_fluentd_lockdir
+        @_fluentd_lockdir ||= ENV['FLUENTD_LOCKDIR']
       end
 
       def configure(conf)
@@ -78,14 +76,14 @@ def multi_workers_ready?
 
       def acquire_worker_lock(name, &block)
         if fluentd_lockdir.nil?
-          raise RuntimeError, "fail to create lockfile on '#{fluentd_lockdir}'"
+          raise InvalidLockDirectory, "can't acquire lock because FLUENTD_LOCKDIR isn't set"
         end
 
         name = name.gsub(/[^a-zA-Z0-9]/, "_")
         lockfile = "fluentd-#{name}.lock"
         File.open(File.join(fluentd_lockdir, lockfile), "w") do |f|
           f.flock(File::LOCK_EX)
-          block.call()
+          yield
         end
       end