summaryrefslogtreecommitdiff
path: root/lib/oxidized/core.rb
diff options
context:
space:
mode:
authorElvin Efendi <elvin.efendiev@shopify.com>2015-12-09 23:43:32 -0500
committerElvin Efendi <elvin.efendiev@shopify.com>2015-12-13 19:02:36 -0500
commit1c4f886e883f947b649613a21955929fa6d7e94c (patch)
treef505d91af55ee18837d0290f3d9ea7ff8531240b /lib/oxidized/core.rb
parent82db9fdd9c135a445a4839e39b245a9965091219 (diff)
refactor and fix bugs introduced with new changes
Diffstat (limited to 'lib/oxidized/core.rb')
-rw-r--r--lib/oxidized/core.rb12
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/oxidized/core.rb b/lib/oxidized/core.rb
index 1b918d1..d57c5cb 100644
--- a/lib/oxidized/core.rb
+++ b/lib/oxidized/core.rb
@@ -1,12 +1,4 @@
module Oxidized
- require 'oxidized/log'
- require 'oxidized/string'
- require 'oxidized/config'
- require 'oxidized/config/vars'
- require 'oxidized/worker'
- require 'oxidized/nodes'
- require 'oxidized/manager'
- require 'oxidized/hook'
class << self
def new *args
Core.new args
@@ -17,7 +9,6 @@ module Oxidized
class NoNodesFound < OxidizedError; end
def initialize args
- Config.load
Oxidized.mgr = Manager.new
Oxidized.Hooks = HookManager.from_config(Oxidized.config)
nodes = Nodes.new
@@ -28,7 +19,8 @@ module Oxidized
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'
+ 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, Oxidized.config.rest
@rest.run