From f2da63369fcb754e3715091cc4fd2f93db42106e Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Tue, 27 Oct 2015 14:49:52 -0400 Subject: better test framework, more specs and Travis CI --- lib/oxidized/core.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/oxidized/core.rb') diff --git a/lib/oxidized/core.rb b/lib/oxidized/core.rb index 6e7a352..1b918d1 100644 --- a/lib/oxidized/core.rb +++ b/lib/oxidized/core.rb @@ -17,19 +17,20 @@ module Oxidized class NoNodesFound < OxidizedError; end def initialize args + Config.load Oxidized.mgr = Manager.new - Oxidized.Hooks = HookManager.from_config CFG + Oxidized.Hooks = HookManager.from_config(Oxidized.config) nodes = Nodes.new raise NoNodesFound, 'source returns no usable nodes' if nodes.size == 0 @worker = Worker.new nodes trap('HUP') { nodes.load } - if CFG.rest? + if Oxidized.config.rest? begin require 'oxidized/web' rescue LoadError raise OxidizedError, 'oxidized-web not found: sudo gem install oxidized-web - or disable web support by setting "rest: false" in your configuration' end - @rest = API::Web.new nodes, CFG.rest + @rest = API::Web.new nodes, Oxidized.config.rest @rest.run end run -- cgit v1.2.1