* [shogi-server] - shogi_server/league/floodgate.rb: Improved robustness against...

diff --git a/changelog b/changelog
index a562e3d..a64dfea 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+2013-11-24  Daigo Moriwaki <daigo at debian dot org>
+
+       * [shogi-server]
+         - shogi_server/league/floodgate.rb: Improved robustness against
+           empty file under ruby 1.9.3p194
+
 2013-11-23  Daigo Moriwaki <daigo at debian dot org>
 
        * [mk_rate]

diff --git a/shogi_server/league/floodgate.rb b/shogi_server/league/floodgate.rb
index b7f26f5..b308454 100644 (file)
--- a/shogi_server/league/floodgate.rb
+++ b/shogi_server/league/floodgate.rb
@@ -216,8 +216,13 @@ class League
       def load
         return unless @file.exist?
 
-        @records = YAML.load_file(@file)
-        unless @records && @records.instance_of?(Array)
+        begin
+          @records = YAML.load_file(@file)
+          unless @records && @records.instance_of?(Array)
+            $logger.error "%s is not a valid yaml file. Instead, an empty array will be used and updated." % [@file]
+            @records = []
+          end
+        rescue
           $logger.error "%s is not a valid yaml file. Instead, an empty array will be used and updated." % [@file]
           @records = []
         end