ref: refs/heads/master
commit 54a47f619ff869a28c47eca98f6f1105709f3662
Author: Ladislav Slezak
Date: Wed Jul 22 13:28:37 2009 +0200
report an error when /var/lib/collectd/ does not exist
report error instead of using nil object
---
.../status/app/controllers/status_controller.rb | 3 +--
plugins/status/lib/status.rb | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb
index 56db2df..ee80bd5 100644
--- a/plugins/status/app/controllers/status_controller.rb
+++ b/plugins/status/app/controllers/status_controller.rb
@@ -76,9 +76,8 @@ class StatusController < ApplicationController
unless permission_check("org.opensuse.yast.system.status.read")
render ErrorResult.error(403, 1, "no permission") and return
else
- @status = Status.new
-
begin
+ @status = Status.new
stop = params[:stop].blank? ? Time.now : Time.at(params[:stop].to_i)
start = params[:start].blank? ? stop - 300 : Time.at(params[:start].to_i)
@status.collect_data(start, stop, params[:data])
diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb
index b227cd5..647d433 100644
--- a/plugins/status/lib/status.rb
+++ b/plugins/status/lib/status.rb
@@ -35,6 +35,9 @@ class Status
if @datapath.blank?
# if no datapath is set, use the first directory in /var/lib/collectd
@datapath = Dir.glob("/var/lib/collectd/*").first
+ if @datapath.nil?
+ raise Exception.new("Cannot read data from /var/lib/collectd/, check 'collectd' status")
+ end
end
@datapath
end
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
