god 0.7.16 → 0.7.17

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,3 +1,7 @@
1
+ == 0.7.17 / 2009-08-25
2
+ * Bug Fixes
3
+ * Fix the glob and directory config loading for -c option
4
+
1
5
  == 0.7.16 / 2009-08-24
2
6
  * Minor Enhancements
3
7
  * Better logging for disk_usage condition [github.com/lettherebecode]
@@ -1,4 +1,4 @@
1
1
  ---
2
2
  :major: 0
3
3
  :minor: 7
4
- :patch: 16
4
+ :patch: 17
@@ -2,11 +2,11 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{god}
5
- s.version = "0.7.16"
5
+ s.version = "0.7.17"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Tom Preston-Werner"]
9
- s.date = %q{2009-08-24}
9
+ s.date = %q{2009-08-25}
10
10
  s.default_executable = %q{god}
11
11
  s.description = %q{God is an easy to configure, easy to extend monitoring framework written in Ruby.}
12
12
  s.email = %q{tom@mojombo.com}
@@ -142,27 +142,19 @@ module God
142
142
  end
143
143
 
144
144
  def load_config(config)
145
- if File.directory? config
146
- files_loaded = false
147
- Dir[File.expand_path('**/*.god', config)].each do |god_file|
148
- files_loaded ||= load_god_file(File.expand_path(god_file))
149
- end
150
- unless files_loaded
151
- abort "No files could be loaded"
152
- end
153
- else
154
- files = Dir.glob(config)
155
- abort "No files could be loaded" if files.empty?
156
- files.each do |f|
157
- unless load_god_file(File.expand_path(config))
158
- abort "File '#{config}' could not be loaded"
159
- end
145
+ files = File.directory?(config) ? Dir['**/*.god'] : Dir[config]
146
+ abort "No files could be found" if files.empty?
147
+ files.each do |god_file|
148
+ unless load_god_file(god_file)
149
+ abort "File '#{god_file}' could not be loaded"
160
150
  end
161
151
  end
162
152
  end
163
153
 
164
154
  def load_god_file(god_file)
155
+ applog(nil, :info, "Loading #{god_file}")
165
156
  load File.expand_path(god_file)
157
+ true
166
158
  rescue Exception => e
167
159
  if e.instance_of?(SystemExit)
168
160
  raise
@@ -170,7 +162,7 @@ module God
170
162
  puts "There was an error in #{god_file}"
171
163
  puts "\t" + e.message
172
164
  puts "\t" + e.backtrace.join("\n\t")
173
- return false
165
+ false
174
166
  end
175
167
  end
176
168
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: god
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.16
4
+ version: 0.7.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-08-24 00:00:00 -07:00
12
+ date: 2009-08-25 00:00:00 -07:00
13
13
  default_executable: god
14
14
  dependencies: []
15
15