X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=blobdiff_plain;f=shogi-server;h=d3b4f5b7a946c44d0bd1f52645bd8c597b228db9;hp=b2417390d2d3becf6444d660fdf352035fc91494;hb=893e6e974a00a76cab6a22bcfb45ef8bd0d1e05f;hpb=810c0751b2b94f92fd50b4c769fda4ed571f1942;ds=sidebyside

diff --git a/shogi-server b/shogi-server
index b241739..d3b4f5b 100755
--- a/shogi-server
+++ b/shogi-server
@@ -25,9 +25,15 @@
 #
 #
 
-TOP_DIR = File.expand_path(File.dirname(__FILE__))
+$topdir = nil
+$league = nil
+$logger = nil
+$config = nil
 $:.unshift File.dirname(__FILE__)
 require 'shogi_server'
+require 'shogi_server/config'
+require 'shogi_server/util'
+require 'tempfile'
 
 #################################################
 # MAIN
@@ -65,9 +71,6 @@ OPTIONS
         --player-log-dir dir
                 log network messages for each player. Log files
                 will be put in the dir.
-        --floodgate-history
-                file name to record Floodgate game history
-                default: './floodgate_history.yaml'
 
 LICENSE
 	GPL versoin 2 or later
@@ -79,6 +82,7 @@ RELEASE
 
 REVISION
 	#{ShogiServer::Revision}
+
 EOM
 end
 
@@ -103,13 +107,16 @@ def log_error(str)
 end
 
 
+# Parse command line options. Return a hash containing the option strings
+# where a key is the option name without the first two slashes. For example,
+# {"pid-file" => "foo.pid"}.
+#
 def parse_command_line
   options = Hash::new
   parser = GetoptLong.new(
     ["--daemon",            GetoptLong::REQUIRED_ARGUMENT],
     ["--pid-file",          GetoptLong::REQUIRED_ARGUMENT],
-    ["--player-log-dir",    GetoptLong::REQUIRED_ARGUMENT],
-    ["--floodgate-history", GetoptLong::REQUIRED_ARGUMENT])
+    ["--player-log-dir",    GetoptLong::REQUIRED_ARGUMENT])
   parser.quiet = true
   begin
     parser.each_option do |name, arg|
@@ -123,6 +130,70 @@ def parse_command_line
   return options
 end
 
+# Check command line options.
+# If any of them is invalid, exit the process.
+#
+def check_command_line
+  if (ARGV.length != 2)
+    usage
+    exit 2
+  end
+
+  if $options["daemon"]
+    $options["daemon"] = File.expand_path($options["daemon"], File.dirname(__FILE__))
+    unless is_writable_dir? $options["daemon"]
+      usage
+      $stderr.puts "Can not create a file in the daemon directory: %s" % [$options["daemon"]]
+      exit 5
+    end
+  end
+
+  $topdir = $options["daemon"] || File.expand_path(File.dirname(__FILE__))
+
+  if $options["player-log-dir"]
+    $options["player-log-dir"] = File.expand_path($options["player-log-dir"], $topdir)
+    unless is_writable_dir?($options["player-log-dir"])
+      usage
+      $stderr.puts "Can not write a file in the player log dir: %s" % [$options["player-log-dir"]]
+      exit 3
+    end 
+  end
+
+  if $options["pid-file"] 
+    $options["pid-file"] = File.expand_path($options["pid-file"], $topdir)
+    unless ShogiServer::is_writable_file? $options["pid-file"]
+      usage
+      $stderr.puts "Can not create the pid file: %s" % [$options["pid-file"]]
+      exit 4
+    end
+  end
+
+  if $options["floodgate-history"]
+    $stderr.puts "WARNING: --floodgate-history has been deprecated."
+    $options["floodgate-history"] = nil
+  end
+end
+
+# See if a file can be created in the directory.
+# Return true if a file is writable in the directory, otherwise false.
+#
+def is_writable_dir?(dir)
+  unless File.directory? dir
+    return false
+  end
+
+  result = true
+
+  begin
+    temp_file = Tempfile.new("dummy-shogi-server", dir)
+    temp_file.close true
+  rescue
+    result = false
+  end
+
+  return result
+end
+
 def write_pid_file(file)
   open(file, "w") do |fh|
     fh.puts "#{$$}"
@@ -152,15 +223,22 @@ def login_loop(client)
   player = login = nil
  
   while r = select([client], nil, nil, ShogiServer::Login_Time) do
-    break unless str = r[0].first.gets
-    $mutex.lock # guards LEAGUE
+    str = nil
+    begin
+      break unless str = r[0].first.gets
+    rescue Exception => ex
+      # It is posssible that the socket causes an error (ex. Errno::ECONNRESET)
+      log_error("login_loop: #{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}")
+      break
+    end
+    $mutex.lock # guards $league
     begin
       str =~ /([\r\n]*)$/
       eol = $1
       if (ShogiServer::Login::good_login?(str))
         player = ShogiServer::Player::new(str, client, eol)
         login  = ShogiServer::Login::factory(str, player)
-        if (current_player = LEAGUE.find(player.name))
+        if (current_player = $league.find(player.name))
           if (current_player.password == player.password &&
               current_player.status != "game")
             log_message(sprintf("user %s login forcely", player.name))
@@ -171,7 +249,7 @@ def login_loop(client)
             break
           end
         end
-        LEAGUE.add(player)
+        $league.add(player)
         break
       else
         client.write("LOGIN:incorrect" + eol)
@@ -185,7 +263,7 @@ def login_loop(client)
 end
 
 def setup_logger(log_file)
-  logger = Logger.new(log_file, 'daily')
+  logger = ShogiServer::Logger.new(log_file, 'daily')
   logger.formatter = ShogiServer::Formatter.new
   logger.level = $DEBUG ? Logger::DEBUG : Logger::INFO  
   logger.datetime_format = "%Y-%m-%d %H:%M:%S"
@@ -200,21 +278,39 @@ def setup_watchdog_for_giant_lock
   end
 end
 
-def setup_floodgate
-  return Thread.start do 
+def setup_floodgate(game_names)
+  return Thread.start(game_names) do |game_names|
     Thread.pass
-    floodgate = ShogiServer::League::Floodgate.new(LEAGUE)
-    log_message("Flooddgate reloaded. The next match will start at %s." % 
-                [floodgate.next_time])
-
     while (true)
       begin
+        leagues = game_names.collect do |game_name|
+          floodgate = ShogiServer::League::Floodgate.new($league, 
+                                                         {:game_name => game_name})
+          log_message("Floodgate reloaded. The next match will start at %s." % 
+                      [floodgate.next_time])
+          floodgate
+        end
+        leagues.delete_if do |floodgate|
+          ret = false
+          unless floodgate.next_time 
+            log_error("Unsupported game name: %s" % floodgate.game_name)
+            ret = true
+          end
+          ret
+        end
+        if leagues.empty?
+          log_error("No valid Floodgate game names found")
+          return # exit from this thread
+        end
+
+        floodgate = leagues.min {|a,b| a.next_time <=> b.next_time}
         diff = floodgate.next_time - Time.now
         if diff > 0
           sleep(diff/2)
           next
         end
-        LEAGUE.reload
+        log_message("Starting Floodgate games...: %s" % [floodgate.game_name])
+        $league.reload
         floodgate.match_game
         floodgate.charge
         next_time = floodgate.next_time
@@ -222,9 +318,11 @@ def setup_floodgate
           log_message("Reloading source...")
           ShogiServer.reload
         end
-        floodgate = ShogiServer::League::Floodgate.new(LEAGUE, next_time)
-        log_message("Floodgate: The next match will start at %s." % 
-                    [floodgate.next_time])
+        floodgate = ShogiServer::League::Floodgate.new($league, 
+                                                       {:game_name => game_name,
+                                                        :next_time => next_time})
+        log_message("Floodgate: The next match of %s will start at %s." % 
+                    [floodgate.game_name, floodgate.next_time])
       rescue Exception => ex 
         # ignore errors
         log_error("[in Floodgate's thread] #{ex} #{ex.backtrace}")
@@ -236,37 +334,18 @@ end
 def main
   
   $options = parse_command_line
-  if (ARGV.length != 2)
-    usage
-    exit 2
-  end
-  if $options["player-log-dir"]
-    $options["player-log-dir"] = File.expand_path($options["player-log-dir"])
-  end
-  if $options["player-log-dir"] && 
-     !File.directory?($options["player-log-dir"])
-    usage
-    exit 3
-  end
-  if $options["pid-file"] 
-    $options["pid-file"] = File.expand_path($options["pid-file"])
-  end
-  $options["floodgate-history"] ||= File.join(File.dirname(__FILE__), "floodgate_history.yaml")
-  $options["floodgate-history"] = File.expand_path($options["floodgate-history"])
+  check_command_line
+  $config = ShogiServer::Config.new $options
 
-  LEAGUE.event = ARGV.shift
-  port = ARGV.shift
+  $league = ShogiServer::League.new($topdir)
 
-  dir = $options["daemon"]
-  dir = File.expand_path(dir) if dir
-  if dir && ! File.exist?(dir)
-    FileUtils.mkdir(dir)
-  end
+  $league.event = ARGV.shift
+  port = ARGV.shift
 
-  log_file = dir ? File.join(dir, "shogi-server.log") : STDOUT
+  log_file = $options["daemon"] ? File.join($options["daemon"], "shogi-server.log") : STDOUT
   $logger = setup_logger(log_file)
 
-  LEAGUE.dir = dir || TOP_DIR
+  $league.dir = $topdir
 
   config = {}
   config[:Port]       = port
@@ -281,8 +360,8 @@ def main
       write_pid_file($options["pid-file"])
     end
     setup_watchdog_for_giant_lock
-    LEAGUE.setup_players_database
-    fg_thread = setup_floodgate
+    $league.setup_players_database
+    fg_thread = setup_floodgate(["floodgate-900-0", "floodgate-3600-0"])
   end
 
   config[:StopCallback] = Proc.new do
@@ -299,8 +378,10 @@ def main
       fg_thread.kill if fg_thread
     end
   end
-  trap("HUP") do
-    Dependencies.clear
+  unless (RUBY_PLATFORM.downcase =~ /mswin|mingw|cygwin|bccwin/)
+    trap("HUP") do
+      Dependencies.clear
+    end
   end
   $stderr.puts("server started as a deamon [Revision: #{ShogiServer::Revision}]") if $options["daemon"] 
   log_message("server started [Revision: #{ShogiServer::Revision}]")
@@ -322,7 +403,7 @@ def main
           player.game.kill(player)
         end
         player.finish # socket has been closed
-        LEAGUE.delete(player)
+        $league.delete(player)
         log_message(sprintf("user %s logout", player.name))
       ensure
         $mutex.unlock
@@ -338,7 +419,6 @@ if ($0 == __FILE__)
   Thread.abort_on_exception = $DEBUG ? true : false
 
   begin
-    LEAGUE = ShogiServer::League.new(TOP_DIR)
     main
   rescue Exception => ex
     if $logger