From: daigo <beatles@users.sourceforge.jp>
Date: Sun, 25 Jul 2010 08:38:49 +0000 (+0900)
Subject: shogi_server.rb: Fixed a race condition in a case of switching log files
X-Git-Tag: 20170902~106
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;ds=sidebyside;h=5c58c6b8062416d280f85c44d0e6903d3fcda929;p=shogi-server%2Fshogi-server.git

shogi_server.rb: Fixed a race condition in a case of switching log files

Creating a new directory to archive logs may have caused race condition,
which ended up with making the server unavailable. This issue has
been fixed.
---

diff --git a/changelog b/changelog
index 7c72303..ad41df3 100644
--- a/changelog
+++ b/changelog
@@ -5,8 +5,12 @@
 	    + For an unknown error command log, an empty line is no longer logged.
 	    + Commands specific to 81Dojo, starting with '%%%', are just
 	      ignored instead of unknown command errors.
-	  - shogi_server.rb: Refactoring. Added test/TC_logger.rb to test
-	    ShogiServer::Logger class.
+	  - shogi_server.rb: 
+	    + Refactoring. Added test/TC_logger.rb to test
+	      ShogiServer::Logger class.
+	    + Fixed race condition: creating a new directory to archive
+	      logs may have caused race condition, which ended up with
+	      making the server unavailable. This issue has been fixed. 
 
 2010-07-23  Daigo Moriwaki <daigo at debian dot org>
 
diff --git a/shogi_server.rb b/shogi_server.rb
index 7467f6f..d7a3659 100644
--- a/shogi_server.rb
+++ b/shogi_server.rb
@@ -66,21 +66,16 @@ end
 module_function :reload
 
 class Logger < ::Logger
+  @@mkdir_mutex = Mutex.new
+
   def initialize(logdev, shift_age = 0, shift_size = 1048576)
     super
     class << @logdev
       def shift_log_period(now)
         age_file = age_file_name(now)
         move_age_file_in_the_way(age_file)
+        mkdir_for(age_file)
 
-        unless FileTest.directory?(File.dirname(age_file))
-          begin
-            FileUtils.mkdir_p File.dirname(age_file)
-          rescue
-            @dev.write("[ERROR] Could not create a directory: %s\n" % [File.dirname(age_file)])
-            raise RuntimeError.new("Could not create a directory: %s" % [File.dirname(age_file)])
-          end
-        end
         @dev.close
         rename_file(@filename, age_file)
         @dev = create_logfile(@filename)
@@ -114,7 +109,20 @@ class Logger < ::Logger
         @dev.write("[WARN] An existing '#{age_file}' is beeing moved to '#{new_file}'\n")
         rename_file(age_file, new_file)
       end
-    end
+
+      def mkdir_for(path)
+        @@mkdir_mutex.synchronize do
+          unless FileTest.directory?(File.dirname(path))
+            begin
+              FileUtils.mkdir_p File.dirname(path)
+            rescue
+              @dev.write("[ERROR] Could not create a directory: %s\n" % [File.dirname(path)])
+            end
+          end
+        end # mutex
+      end
+
+    end # @logdev
   end
 
 end # class Logger