scout 5.2.1 → 5.2.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 5.2.2
+
+* More graceful handling of *rare* client_history.yaml corruption
+
 == 5.2.1
 
 * Added private-key based code signing

data/lib/scout/server.rb

@@ -394,7 +394,18 @@ module Scout
         create_blank_history
       end
       debug "Loading history file..."
-      @history = File.open(@history_file) { |file| YAML.load(file) }
+      contents=File.read(@history_file)
+      begin
+        @history = YAML.load(contents)
+      rescue => e
+        backup_path=File.join(File.dirname(@history_file), "history.corrupt")
+        info "Couldn't parse the history file. Deleting it and resetting to an empty history file. Keeping a backup at #{backup_path}"
+        File.open(backup_path,"w"){|f|f.write contents}
+        File.delete(@history_file)
+        create_blank_history
+        @history = File.open(@history_file) { |file| YAML.load(file) }
+      end
+
       info "History file loaded."
     end
 

data/lib/scout.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby -wKU
 
 module Scout
-  VERSION = "5.2.1".freeze
+  VERSION = "5.2.2".freeze
 end
 
 require "scout/command"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scout
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 5
   - 2
-  - 1
-  version: 5.2.1
+  - 2
+  version: 5.2.2
 platform: ruby
 authors: 
 - Scout Monitoring
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
+date: 2011-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency