提交: a6cb7fddeb7af543c81366849090dbf7ceca4e73 - shogi-server (git)

shogi-server source

Commit MetaInfo

• 修订版: a6cb7fddeb7af543c81366849090dbf7ceca4e73 (tree)
• 时间: 2015-12-13 21:30:38
• 作者: Daigo Moriwaki <daigo@debi...>
• Commiter: Daigo Moriwaki

Log Message

Merge branch 'wdoor-stable'

更改概述

• modified: changelog
• modified: shogi_server/login.rb
• modified: test/TC_fork.rb
• modified: test/baseclient.rb

差异

--- a/changelog
+++ b/changelog
@@ -43,6 +43,12 @@
 	    http://www.sgtpepper.net/hyspro/diary/20150214.html.
 	  - Added a companion R script: histogram.R 
 
[phone]  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]

--- 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)

--- 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
 

--- 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