Commit: 29968bc75167d7fe325041225fe89b9adffea571 - shogi-server (git)

shogi-server source

Commit MetaInfo

• Revisão: 29968bc75167d7fe325041225fe89b9adffea571 (tree)
• Hora: 2013-11-24 12:05:52
• Autor: Daigo Moriwaki <daigo@debi...>
• Commiter: Daigo Moriwaki

Mensagem de Log

* [shogi-server] - shogi_server/league/floodgate.rb: Improved robustness against empty file under ruby 1.9.3p194

Mudança Sumário

• modified: changelog
• modified: shogi_server/league/floodgate.rb

Diff

--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
[phone]  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]

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