summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/oxidized/cli.rb2
-rw-r--r--lib/oxidized/source/http.rb3
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/oxidized/cli.rb b/lib/oxidized/cli.rb
index 15d20c5..d35eab3 100644
--- a/lib/oxidized/cli.rb
+++ b/lib/oxidized/cli.rb
@@ -24,7 +24,7 @@ module Oxidized
Config.load(@opts)
Oxidized.setup_logger
- @pidfile = File.expand_path("pid")
+ @pidfile = File.join(Oxidized::Config::Root, 'pid')
end
def crash error
diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 6e765cf..93361a2 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -28,6 +28,9 @@ class HTTP < Source
end
request = Net::HTTP::Get.new(uri.request_uri, headers)
+ if (@cfg.user && @cfg.pass)
+ request.basic_auth(@cfg.user,@cfg.pass)
+ end
response = http.request(request)
data = JSON.parse(response.body)