X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=blobdiff_plain;f=shogi_server.rb;h=c957f3d3c1c7bb0f000322b9a436c0105400cd2f;hp=d7a3659c0bc50d90ec4e94b943e50eeaa94a1773;hb=eed74ba8dc18b3843e263ed35eeeeab4c086f520;hpb=5c58c6b8062416d280f85c44d0e6903d3fcda929 diff --git a/shogi_server.rb b/shogi_server.rb index d7a3659..c957f3d 100644 --- a/shogi_server.rb +++ b/shogi_server.rb @@ -1,7 +1,7 @@ ## $Id$ ## Copyright (C) 2004 NABEYA Kenichi (aka nanami@2ch) -## Copyright (C) 2007-2008 Daigo Moriwaki (daigo at debian dot org) +## Copyright (C) 2007-2012 Daigo Moriwaki (daigo at debian dot org) ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ require 'webrick' require 'fileutils' require 'logger' +require 'shogi_server/compatible' require 'shogi_server/board' require 'shogi_server/game' require 'shogi_server/league' @@ -66,7 +67,6 @@ end module_function :reload class Logger < ::Logger - @@mkdir_mutex = Mutex.new def initialize(logdev, shift_age = 0, shift_size = 1048576) super @@ -74,7 +74,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 +113,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