summaryrefslogtreecommitdiff
path: root/lib/oxidized/config
diff options
context:
space:
mode:
authorSaku Ytti <saku@ytti.fi>2014-02-23 19:11:29 +0200
committerSaku Ytti <saku@ytti.fi>2014-02-23 19:11:29 +0200
commit8880188001da23a5f0960e3970c4eb9bbd448306 (patch)
tree41a1f79450ff1683a2d5aa1f024a564e84230e25 /lib/oxidized/config
parent06e5f68db6cfcbd80295874db1f00a25e8ba1229 (diff)
Migrate to sinatra/puma from webrick
As I can't do IO#select on sinatra/puma to run it when I have time, I have to run it on separate thread. This means Nodes container needs to be thread safe, it now has ghetto mutex locking, but I probably need to be be more focused what are the external methods that can be called and wrap those in @mutex.synchronize Provide also HTML UI not just JSON for ghetto UI to people who don't want to integrate
Diffstat (limited to 'lib/oxidized/config')
-rw-r--r--lib/oxidized/config/core.rb2
-rw-r--r--lib/oxidized/config/defaults.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/oxidized/config/core.rb b/lib/oxidized/config/core.rb
index 6c91920..c2cde58 100644
--- a/lib/oxidized/config/core.rb
+++ b/lib/oxidized/config/core.rb
@@ -11,7 +11,7 @@ module Oxidized
# load config from file or bootstrap with built-ins
def load
if File.exists? @file
- marshal_load YAML.load_file @file
+ marshal_load YAML.load_file @file
else
require 'oxidized/config/bootstrap'
end
diff --git a/lib/oxidized/config/defaults.rb b/lib/oxidized/config/defaults.rb
index d189ca3..c30143f 100644
--- a/lib/oxidized/config/defaults.rb
+++ b/lib/oxidized/config/defaults.rb
@@ -5,7 +5,7 @@ module Oxidized
InputDir = File.join Directory, %w(lib oxidized input)
OutputDir = File.join Directory, %w(lib oxidized output)
ModelDir = File.join Directory, %w(lib oxidized model)
- SourceDir = File.join Directory, %w(lib oxidized source)
+ SourceDir = File.join Directory, %w(lib oxidized source)
Sleep = 1
end
class << self