OSDN Git Service

Rleased: Revision "20131104"
[shogi-server/shogi-server.git] / shogi_server.rb
index d7a3659..8bb2d6c 100644 (file)
@@ -50,8 +50,7 @@ Default_Game_Name = "default-1500-0"
 One_Time = 10
 Least_Time_Per_Move = 1
 Login_Time = 300                # time for LOGIN
-Release  = "$Id$"
-Revision = (r = /Revision: (\d+)/.match("$Revision$") ? r[1] : 0)
+Revision = "20131104"
 
 RELOAD_FILES = ["shogi_server/league/floodgate.rb",
                 "shogi_server/league/persistent.rb",
@@ -66,7 +65,6 @@ end
 module_function :reload
 
 class Logger < ::Logger
-  @@mkdir_mutex = Mutex.new
 
   def initialize(logdev, shift_age = 0, shift_size = 1048576)
     super
@@ -74,7 +72,10 @@ class Logger < ::Logger
       def shift_log_period(now)
         age_file = age_file_name(now)
         move_age_file_in_the_way(age_file)
-        mkdir_for(age_file)
+        unless Mkdir.mkdir_for(age_file)
+          @dev.write("[ERROR] Could not create a directory: %s\n" % [File.dirname(age_file)])
+          return true
+        end
 
         @dev.close
         rename_file(@filename, age_file)
@@ -110,18 +111,6 @@ class Logger < ::Logger
         rename_file(age_file, new_file)
       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