Use lambdas, rescue the right thing

SeanRoberts · Feb 25, 2012 · 4594804 · 4594804
1 parent febef3a
commit 4594804
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/models/group.rb b/app/models/group.rb
@@ -17,7 +17,7 @@ def cache_path
     end
 
     def raw_xml
-      if !File.exist?(cache_path) || File.mtime(cache_path) < 1.hours.ago
+      if !File.exist?(cache_path) || File.mtime(cache_path) < lambda { 1.hours.ago }.call
         remote_xml
       else
         local_xml

diff --git a/app/models/player_list.rb b/app/models/player_list.rb
@@ -2,6 +2,7 @@ class PlayerList
   def initialize
     @players = []
     regex = /^#\s+\d+\s+\"(.+)\"\s+([_A-Za-z:0-9]+)\s/
+    raise "Error getting status." if raw_status.blank?
     raw_status.split("\n")[8..-1].each do |line|
       match = line.match(regex)
       @players << Player.new(match.captures[0], match.captures[1]) if match
@@ -23,7 +24,7 @@ def players
 
   private
     def raw_status
-      if !File.exist?(cache_path) || File.mtime(cache_path) < 5.minutes.ago
+      if !File.exist?(cache_path) || File.mtime(cache_path) < lambda { 5.minutes.ago }.call
         remote_status
       else
         local_status
@@ -38,8 +39,8 @@ def remote_status
         f.puts status
         f.close
         status
-      rescue OpenURI::HTTPError
-        local_xml
+      rescue RCon::NetworkException
+        local_status
       end
     end