From: daigo <beatles@users.sourceforge.jp>
Date: Sat, 24 Jul 2010 03:54:36 +0000 (+0900)
Subject: Resolved merge conflict
X-Git-Tag: 20170902~111
X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=commitdiff_plain;h=2da79bca4e0c25714cc4e7b74fa17f859c83183a;hp=cd3b4625cb8625594744999cbac91e0001368392

Resolved merge conflict
---

diff --git a/changelog b/changelog
index afa2137..6bc7d5e 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+2010-07-23  Daigo Moriwaki <daigo at debian dot org>
+
+	* [shogi-server]
+	  - shogi_server/league/floodgate_thread.rb: When the server run
+	    with DEBUG mode, it ended up with an undefined variable error. 
+	    This issue has been fixed.
+
 2010-07-17  Daigo Moriwaki <daigo at debian dot org>
 
 	* [shogi-server]
diff --git a/shogi_server/league/floodgate_thread.rb b/shogi_server/league/floodgate_thread.rb
index 1b8ebc2..9748363 100644
--- a/shogi_server/league/floodgate_thread.rb
+++ b/shogi_server/league/floodgate_thread.rb
@@ -50,7 +50,6 @@ module ShogiServer
     def wait_next_floodgate(floodgate)
       diff = floodgate.next_time - Time.now
       if diff > 0
-        floodgate_reload_log(leagues) if $DEBUG
         sleep(diff/2)
         return true
       end