Merge branch 'pull/843' into titles

[rails.git] / lib / daemons / gpx_import_ctl

diff --git a/lib/daemons/gpx_import_ctl b/lib/daemons/gpx_import_ctl
index 43fb48c1567c894bee6e04e26bf94df0bb24ad14..495ce1fb12dfc4a926b6e80496f59c77b56c8b05 100755 (executable)
--- a/lib/daemons/gpx_import_ctl
+++ b/lib/daemons/gpx_import_ctl
@@ -6,16 +6,18 @@ require "erb"
 
 class Hash
   def with_symbols!
 
 class Hash
   def with_symbols!

-    keys.each { |key| self[key.to_s.to_sym] = self[key] }
+    each_key { |key| self[key.to_s.to_sym] = self[key] }

     self
   end
 end
 
     self
   end
 end
 

-options = YAML.load(
+options = YAML.safe_load(

   ERB.new(
     IO.read(
       File.dirname(__FILE__) + "/../../config/daemons.yml"
   ERB.new(
     IO.read(
       File.dirname(__FILE__) + "/../../config/daemons.yml"

-    )).result).with_symbols!
+    )
+  ).result
+).with_symbols!

 options[:dir_mode] = options[:dir_mode].to_sym
 
 Daemons.run File.dirname(__FILE__) + "/gpx_import.rb", options
 options[:dir_mode] = options[:dir_mode].to_sym
 
 Daemons.run File.dirname(__FILE__) + "/gpx_import.rb", options