diff options
author | ytti <saku@ytti.fi> | 2015-10-20 16:11:47 +0300 |
---|---|---|
committer | ytti <saku@ytti.fi> | 2015-10-20 16:11:47 +0300 |
commit | 00f95d4f0b85cd74da1b0c8e7799cc5d2b4ed901 (patch) | |
tree | 7bd878a863dc8d9cdc212720709cb535d9cab848 /lib | |
parent | 12c0c34928a2273d8ede99f63055dab19893328a (diff) | |
parent | de5aedcbd1cc26a31916bfe1950eca8fc3ae076d (diff) |
Merge pull request #206 from skoef/master
use different path for debug logging
Diffstat (limited to 'lib')
-rw-r--r-- | lib/oxidized/input/ftp.rb | 2 | ||||
-rw-r--r-- | lib/oxidized/input/ssh.rb | 2 | ||||
-rw-r--r-- | lib/oxidized/input/telnet.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/oxidized/input/ftp.rb b/lib/oxidized/input/ftp.rb index ccbf5ef..70db60c 100644 --- a/lib/oxidized/input/ftp.rb +++ b/lib/oxidized/input/ftp.rb @@ -18,7 +18,7 @@ module Oxidized def connect node @node = node @node.model.cfg['ftp'].each { |cb| instance_exec(&cb) } - @log = File.open(CFG.input.debug?.to_s + '-ftp', 'w') if CFG.input.debug? + @log = File.open(Oxidized::Config::Crash + "-#{@node.ip}-ftp", 'w') if CFG.input.debug? @ftp = Net::FTP.new @node.ip, @node.auth[:username], @node.auth[:password] connected? end diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb index d6b4e1f..21fb02c 100644 --- a/lib/oxidized/input/ssh.rb +++ b/lib/oxidized/input/ssh.rb @@ -20,7 +20,7 @@ module Oxidized @output = '' @node.model.cfg['ssh'].each { |cb| instance_exec(&cb) } secure = CFG.input.ssh.secure - @log = File.open(CFG.input.debug?.to_s + '-ssh', 'w') if CFG.input.debug? + @log = File.open(Oxidized::Config::Crash + "-#{@node.ip}-ssh", 'w') if CFG.input.debug? port = vars(:ssh_port) || 22 @ssh = Net::SSH.start @node.ip, @node.auth[:username], :port => port.to_i, :password => @node.auth[:password], :timeout => CFG.timeout, diff --git a/lib/oxidized/input/telnet.rb b/lib/oxidized/input/telnet.rb index cedcd88..bf0140c 100644 --- a/lib/oxidized/input/telnet.rb +++ b/lib/oxidized/input/telnet.rb @@ -16,7 +16,7 @@ module Oxidized 'Port' => port.to_i, 'Timeout' => @timeout, 'Model' => @node.model } - opt['Output_log'] = CFG.input.debug?.to_s + '-telnet' if CFG.input.debug? + opt['Output_log'] = Oxidized::Config::Crash + "-#{@node.ip}-telnet" if CFG.input.debug? @telnet = Net::Telnet.new opt if @node.auth[:username] and @node.auth[:username].length > 0 |