Merge remote-tracking branch 'origin/master' into wdoor-stable

Conflicts:
	changelog

diff --git a/changelog b/changelog
index aae3085..2e21e18 100644 (file)
--- a/changelog
+++ b/changelog
@@ -19,6 +19,12 @@
            http://www.sgtpepper.net/hyspro/diary/20150214.html.
          - Added a companion R script: histogram.R 
 
+2015-02-01  Daigo Moriwaki <daigo at debian dot org>
+
+       * [shogi-server]
+         - shogi_server/login.rb: When players are logged in, log their
+           player_id if they have it.
+
 2015-01-20  Daigo Moriwaki <daigo at debian dot org>
 
        * [mk_rate]

diff --git a/shogi_server.rb b/shogi_server.rb
index 490249c..8a9d03d 100644 (file)
--- a/shogi_server.rb
+++ b/shogi_server.rb
@@ -50,7 +50,7 @@ Default_Timeout = 60            # for single socket operation
 Default_Game_Name = "default-1500-0"
 One_Time = 10
 Login_Time = 300                # time for LOGIN
-Revision = "20150117"
+Revision = "20150201"
 
 RELOAD_FILES = ["shogi_server/league/floodgate.rb",
                 "shogi_server/league/persistent.rb",

diff --git a/shogi_server/login.rb b/shogi_server/login.rb
index 79e770e..8255a1e 100644 (file)
--- a/shogi_server/login.rb
+++ b/shogi_server/login.rb
@@ -109,7 +109,8 @@ class Login
 
   def process
     @player.write_safe(sprintf("LOGIN:%s OK\n", @player.name))
-    log_message(sprintf("user %s run in %s mode", @player.name, @player.protocol))
+    log_message("user %s run in %s mode" % [(@player.rated? ? @player.player_id : @player.name),
+                                            @player.protocol])
   end
 
   def incorrect_duplicated_player(str)

diff --git a/test/TC_fork.rb b/test/TC_fork.rb
index cfdf9e1..6079802 100644 (file)
--- a/test/TC_fork.rb
+++ b/test/TC_fork.rb
@@ -118,8 +118,9 @@ class TestFork < BaseClient
 
     result, result2 = handshake do
       source_game = parse_game_name(@admin)
+      sleep 0.2
       @admin.puts "%%FORK #{source_game}" # nil for new_buoy_game name
-      sleep 1
+      sleep 1.2
       assert /##\[FORK\]: new buoy game name: buoy_TestFork_1-1500-0/ =~ @admin.message
     end
 

diff --git a/test/baseclient.rb b/test/baseclient.rb
index 5be03b9..f6d7487 100644 (file)
--- a/test/baseclient.rb
+++ b/test/baseclient.rb
@@ -190,7 +190,7 @@ class BaseClient < Test::Unit::TestCase
     @p1.login
     sleep 0.1
     @p2.login
-    sleep 0.1
+    sleep 0.5
     @p1.game
     sleep 0.1
     @p2.game