shogi_server/command.rb: Prevent a possible password from be logged in a log file...

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

diff --git a/shogi_server/game.rb b/shogi_server/game.rb
index 9e8f71b..e6d58d9 100644 (file)
--- a/shogi_server/game.rb
+++ b/shogi_server/game.rb
@@ -19,6 +19,7 @@
 
 require 'shogi_server/league/floodgate'
 require 'shogi_server/game_result'
+require 'shogi_server/util'
 
 module ShogiServer # for a namespace
 
@@ -71,8 +72,8 @@ class Game
                              @prepared_time.strftime("%Y"),
                              @prepared_time.strftime("%m"),
                              @prepared_time.strftime("%d"))
-    FileUtils.mkdir_p(log_dir_name) unless File.exist?(log_dir_name)
     @logfile = File.join(log_dir_name, @game_id + ".csa")
+    Mkdir.mkdir_for(@logfile)
 
     $league.games[@game_id] = self
 
@@ -174,7 +175,7 @@ class Game
   end
 
   # class Game
-  def handle_one_move(str, player)
+  def handle_one_move(str, player, end_time)
     unless turn?(player)
       return false if str == :timeout
 
@@ -186,7 +187,7 @@ class Game
     end
 
     finish_flag = true
-    @end_time = Time::new
+    @end_time = end_time
     t = [(@end_time - @start_time).floor, Least_Time_Per_Move].max
     
     move_status = nil
@@ -258,7 +259,7 @@ class Game
     @result.process if @result
     finish() if finish_flag
     @current_player, @next_player = @next_player, @current_player
-    @start_time = Time::new
+    @start_time = Time.now
     return finish_flag
   end
 
@@ -276,7 +277,7 @@ class Game
     @gote.write_safe(sprintf("START:%s\n", @game_id))
     @sente.mytime = @total_time
     @gote.mytime = @total_time
-    @start_time = Time::new
+    @start_time = Time.now
   end
 
   def propose
@@ -288,7 +289,7 @@ class Game
     @sente.write_safe(propose_message("+"))
     @gote.write_safe(propose_message("-"))
 
-    now = Time::new.strftime("%Y/%m/%d %H:%M:%S")
+    now = Time.now.strftime("%Y/%m/%d %H:%M:%S")
     @fh.puts("$START_TIME:#{now}")
     @fh.print <<EOM
 P1-KY-KE-GI-KI-OU-KI-GI-KE-KY
@@ -387,7 +388,7 @@ EOM
   private
   
   def issue_current_time
-    time = Time::new.strftime("%Y%m%d%H%M%S").to_i
+    time = Time.now.strftime("%Y%m%d%H%M%S").to_i
     @@mutex.synchronize do
       while time <= @@time do
         time += 1