Merge branch 'wdoor-stable'

[shogi-server/shogi-server.git] / shogi_server.rb

diff --git a/shogi_server.rb b/shogi_server.rb
index 7467f6f..4575aa8 100644 (file)
--- 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'
@@ -47,11 +48,11 @@ module ShogiServer # for a namespace
 Max_Identifier_Length = 32
 Default_Timeout = 60            # for single socket operation
 Default_Game_Name = "default-1500-0"
+Default_Max_Moves = 256
+Default_Least_Time_Per_Move = 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 = "20151213"
 
 RELOAD_FILES = ["shogi_server/league/floodgate.rb",
                 "shogi_server/league/persistent.rb",
@@ -66,21 +67,18 @@ end
 module_function :reload
 
 class Logger < ::Logger
+
   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)
-
-        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
+        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)
         @dev = create_logfile(@filename)
@@ -88,7 +86,11 @@ class Logger < ::Logger
       end
 
       def age_file_name(time)
-        postfix = previous_period_end(time).strftime("%Y%m%d") # YYYYMMDD
+        if RUBY_VERSION >= "2.2.0"
+          postfix = previous_period_end(time, @shift_age).strftime("%Y%m%d")   # YYYYMMDD
+        else
+          postfix = previous_period_end(time).strftime("%Y%m%d")       # YYYYMMDD
+        end
         age_file = File.join(
                      File.dirname(@filename),
                      postfix[0..3], # YYYY
@@ -114,7 +116,8 @@ 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
+
+    end # @logdev
   end
 
 end # class Logger