diff options
author | Saku Ytti <saku@ytti.fi> | 2015-09-05 12:32:37 +0300 |
---|---|---|
committer | Saku Ytti <saku@ytti.fi> | 2015-09-05 12:32:37 +0300 |
commit | baf19a281121cf065685f34c20978f0f2ef610af (patch) | |
tree | 959b3b4e55cbe319cc4a7bce7882fed837966ff8 /lib/oxidized/core.rb | |
parent | ba79dea58b459eff8e2dadcffdf5a97e020c8783 (diff) | |
parent | 323f5968e3593539eca0477779114caddbfc751d (diff) |
Merge branch 'feature-hook'
Diffstat (limited to 'lib/oxidized/core.rb')
-rw-r--r-- | lib/oxidized/core.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/oxidized/core.rb b/lib/oxidized/core.rb index 71267dd..b70443c 100644 --- a/lib/oxidized/core.rb +++ b/lib/oxidized/core.rb @@ -6,6 +6,7 @@ module Oxidized require 'oxidized/worker' require 'oxidized/nodes' require 'oxidized/manager' + require 'oxidized/hook' class << self def new *args Core.new args @@ -15,6 +16,7 @@ module Oxidized class Core def initialize args Oxidized.mgr = Manager.new + Oxidized.Hooks = HookManager.from_config CFG nodes = Nodes.new @worker = Worker.new nodes trap('HUP') { nodes.load } |