lib/scout_rails/config.rb in scout_rails-1.0.5.pre vs lib/scout_rails/config.rb in scout_rails-1.0.5
- old
+ new
@@ -1,7 +1,12 @@
module ScoutRails
- class Config
+ class Config
+ DEFAULTS = {
+ 'host' => 'scoutapp.com',
+ 'log_level' => 'info'
+ }
+
def initialize(config_path = nil)
@config_path = config_path
end
def settings
@@ -16,19 +21,22 @@
def config_file
File.expand_path(config_path)
end
def load_file
- if !File.exist?(config_file)
- ScoutRails::Agent.instance.logger.warn "No config file found at [#{config_file}]."
+ begin
+ if !File.exist?(config_file)
+ ScoutRails::Agent.instance.logger.warn "No config file found at [#{config_file}]."
+ @settings = {}
+ else
+ @settings = YAML.load(ERB.new(File.read(config_file)).result(binding))[ScoutRails::Agent.instance.environment.env] || {}
+ end
+ rescue Exception => e
+ ScoutRails::Agent.instance.logger.warn "Unable to load the config file."
+ ScoutRails::Agent.instance.logger.warn e.message
+ ScoutRails::Agent.instance.logger.warn e.backtrace
@settings = {}
- else
- @settings = YAML.load(ERB.new(File.read(config_file)).result(binding))[ScoutRails::Agent.instance.environment.env] || {}
- end
- rescue Exception => e
- ScoutRails::Agent.instance.logger.warn "Unable to load the config file."
- ScoutRails::Agent.instance.logger.warn e.message
- ScoutRails::Agent.instance.logger.warn e.backtrace
- @settings = {}
+ end
+ @settings = DEFAULTS.merge(@settings)
end
- end
-end
+ end # Config
+end # ScoutRails
\ No newline at end of file