X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=blobdiff_plain;f=shogi-server;h=b5e1ecfe4a36d440ab127e801d34329b3263d713;hp=3595fc3cf10fcf2b52a2bc2f85168e49acbc9687;hb=61b4add1cd544134a04466551bcbc9428fd1a777;hpb=8ce6e11bef2f8e46de3816e465a7c127115c4bc1 diff --git a/shogi-server b/shogi-server index 3595fc3..b5e1ecf 100755 --- a/shogi-server +++ b/shogi-server @@ -1,4 +1,4 @@ -#! /usr/bin/env ruby +#! /usr/bin/ruby # $Id$ # # Author:: NABEYA Kenichi, Daigo Moriwaki @@ -6,7 +6,7 @@ # #-- # Copyright (C) 2004 NABEYA Kenichi (aka nanami@2ch) -# Copyright (C) 2007-2008 Daigo Moriwaki (daigo at debian dot org) +# Copyright (C) 2007-2012 Daigo Moriwaki (daigo at debian dot org) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,17 +29,27 @@ $topdir = nil $league = nil $logger = nil $config = nil -$:.unshift File.dirname(__FILE__) +$:.unshift(File.dirname(File.expand_path(__FILE__))) require 'shogi_server' require 'shogi_server/config' +require 'shogi_server/util' +require 'shogi_server/league/floodgate_thread.rb' require 'tempfile' ################################################# # MAIN # +ONE_DAY = 3600 * 24 # in seconds + ShogiServer.reload +# Return +# - a received string +# - :timeout +# - :exception +# - nil when a socket is closed +# def gets_safe(socket, timeout=nil) if r = select([socket], nil, nil, timeout) return r[0].first.gets @@ -54,36 +64,113 @@ end def usage print <.conf". The file will be re-read once just after a + game starts. + + For example, a floodgate-3600-30 game group requires + floodgate-3600-30.conf. However, for floodgate-900-0 and + floodgate-3600-0, which were default enabled in previous + versions, configuration files are optional if you are happy with + default time settings. + File format is: + Line format: + # This is a comment line + DoW Time + ... + where + DoW := "Sun" | "Mon" | "Tue" | "Wed" | "Thu" | "Fri" | "Sat" | + "Sunday" | "Monday" | "Tuesday" | "Wednesday" | "Thursday" | + "Friday" | "Saturday" + Time := HH:MM + + For example, + Sat 13:00 + Sat 22:00 + Sun 13:00 + + PAREMETER SETTING + + In addition, this configuration file allows to set parameters + for the specific Floodaget group. A list of parameters is the + following: + + * pairing_factory: + Specifies a factory function name generating a pairing + method which will be used in a specific Floodgate game. + ex. set pairing_factory floodgate_zyunisen + * sacrifice: + Specifies a sacrificed player. + ex. set sacrifice gps500+e293220e3f8a3e59f79f6b0efffaa931 LICENSE - GPL versoin 2 or later + GPL versoin 2 or later SEE ALSO -RELEASE - #{ShogiServer::Release} - REVISION - #{ShogiServer::Revision} + #{ShogiServer::Revision} EOM end @@ -116,10 +203,12 @@ end 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]) + ["--daemon", GetoptLong::REQUIRED_ARGUMENT], + ["--floodgate-games", GetoptLong::REQUIRED_ARGUMENT], + ["--least-time-per-move", GetoptLong::REQUIRED_ARGUMENT], + ["--max-moves", GetoptLong::REQUIRED_ARGUMENT], + ["--pid-file", GetoptLong::REQUIRED_ARGUMENT], + ["--player-log-dir", GetoptLong::REQUIRED_ARGUMENT]) parser.quiet = true begin parser.each_option do |name, arg| @@ -164,43 +253,36 @@ def check_command_line if $options["pid-file"] $options["pid-file"] = File.expand_path($options["pid-file"], $topdir) - unless is_writable_file? $options["pid-file"] + 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 - $options["floodgate-history"] ||= File.join($topdir, "floodgate_history.yaml") - $options["floodgate-history"] = File.expand_path($options["floodgate-history"], $topdir) - unless is_writable_file? $options["floodgate-history"] - usage - $stderr.puts "Can not create the floodgate history file: %s" % [$options["floodgate-history"]] - exit 6 - end -end - -# See if the file is writable. The file will be created if it does not exist -# yet. -# Return true if the file is writable, otherwise false. -# -def is_writable_file?(file) - if File.exist?(file) - if FileTest.file?(file) - return FileTest.writable_real?(file) - else - return false + if $options["floodgate-games"] + names = $options["floodgate-games"].split(",") + new_names = + names.select do |name| + ShogiServer::League::Floodgate::game_name?(name) + end + if names.size != new_names.size + $stderr.puts "Found a wrong Floodgate game: %s" % [names.join(",")] + exit 6 end + $options["floodgate-games"] = new_names end - - begin - open(file, "w") {|fh| } - FileUtils.rm file - rescue - return false + + if $options["floodgate-history"] + $stderr.puts "WARNING: --floodgate-history has been deprecated." + $options["floodgate-history"] = nil end - return true + $options["max-moves"] ||= ShogiServer::Default_Max_Moves + $options["max-moves"] = $options["max-moves"].to_i + + $options["least-time-per-move"] ||= ShogiServer::Default_Least_Time_Per_Move + $options["least-time-per-move"] = $options["least-time-per-move"].to_i end # See if a file can be created in the directory. @@ -268,9 +350,15 @@ def login_loop(client) player = ShogiServer::Player::new(str, client, eol) login = ShogiServer::Login::factory(str, player) if (current_player = $league.find(player.name)) + # Even if a player is in the 'game' state, when the status of the + # player has not been updated for more than a day, it is very + # likely that the player is stalling. In such a case, a new player + # can override the current player. if (current_player.password == player.password && - current_player.status != "game") - log_message(sprintf("user %s login forcely", player.name)) + (current_player.status != "game" || + Time.now - current_player.last_command_at > ONE_DAY)) + log_message("player %s login forcibly, nudging the former player" % [player.name]) + log_message(" the former player was in %s and received the last command at %s" % [current_player.status, current_player.last_command_at]) current_player.kill else login.incorrect_duplicated_player(str) @@ -307,39 +395,6 @@ def setup_watchdog_for_giant_lock end end -def setup_floodgate - return Thread.start do - 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 - diff = floodgate.next_time - Time.now - if diff > 0 - sleep(diff/2) - next - end - $league.reload - floodgate.match_game - floodgate.charge - next_time = floodgate.next_time - $mutex.synchronize do - 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]) - rescue Exception => ex - # ignore errors - log_error("[in Floodgate's thread] #{ex} #{ex.backtrace}") - end - end - end -end - def main $options = parse_command_line @@ -357,11 +412,12 @@ def main $league.dir = $topdir config = {} + config[:BindAddress] = "0.0.0.0" config[:Port] = port config[:ServerType] = WEBrick::Daemon if $options["daemon"] config[:Logger] = $logger - fg_thread = nil + setup_floodgate = nil config[:StartCallback] = Proc.new do srand @@ -370,7 +426,8 @@ def main end setup_watchdog_for_giant_lock $league.setup_players_database - fg_thread = setup_floodgate + setup_floodgate = ShogiServer::SetupFloodgate.new($options["floodgate-games"]) + setup_floodgate.start end config[:StopCallback] = Proc.new do @@ -384,21 +441,27 @@ def main ["INT", "TERM"].each do |signal| trap(signal) do server.shutdown - fg_thread.kill if fg_thread + setup_floodgate.kill 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}]") server.start do |client| + begin # client.sync = true # this is already set in WEBrick client.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true) # Keepalive time can be set by /proc/sys/net/ipv4/tcp_keepalive_time player, login = login_loop(client) # loop - next unless player + unless player + log_error("Detected a timed out login attempt") + next + end log_message(sprintf("user %s login", player.name)) login.process @@ -409,12 +472,16 @@ def main if (player.game) player.game.kill(player) end - player.finish # socket has been closed + player.finish $league.delete(player) log_message(sprintf("user %s logout", player.name)) ensure $mutex.unlock end + player.wait_write_thread_finish(1000) # milliseconds + rescue Exception => ex + log_error("server.start: #{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}") + end end end