From 4baedb0667185fb899ad1c1f5a7782d1228807a9 Mon Sep 17 00:00:00 2001 From: Saku Ytti Date: Sun, 2 Mar 2014 12:36:37 +0200 Subject: Change dynamic loading If we use assignment method (#method=) we don't get return value, so we never know that manager fails to load. Also we do not want to rescue failures of input/output/source loading, they are catastrophic and should fail whole process, loading of model is not catastrophic. --- lib/oxidized/nodes.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/oxidized/nodes.rb') diff --git a/lib/oxidized/nodes.rb b/lib/oxidized/nodes.rb index 9a3d3bd..0d9fb47 100644 --- a/lib/oxidized/nodes.rb +++ b/lib/oxidized/nodes.rb @@ -9,14 +9,14 @@ module Oxidized with_lock do new = [] @source = CFG.source[:default] - Oxidized.mgr.source = @source + Oxidized.mgr.add_source @source Oxidized.mgr.source[@source].new.load.each do |node| begin - n = Node.new node - rescue LoadError => err - Log.warn 'load error %s with node %s' % [err.message, node] + _node = Node.new node + new.push _node + rescue ModelNotFound => err + Log.error "node %s raised %s with message %s" % [node, err.class, err.message] end - new.push n if n end replace new end -- cgit v1.2.1