diff options
| author | Saku Ytti <saku@ytti.fi> | 2016-01-27 11:16:56 +0000 |
|---|---|---|
| committer | Saku Ytti <saku@ytti.fi> | 2016-01-27 11:16:56 +0000 |
| commit | 3bacf05ab4a21c4f97c59b0fddce7191fa910959 (patch) | |
| tree | b8c2b17960933b0bef504c6d386548c01fa82d26 | |
| parent | 3bf9d74a10ab2f42ee078617f4283eedc9e9123b (diff) | |
fixes #288
| -rw-r--r-- | lib/oxidized/config.rb | 1 | ||||
| -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 |
4 files changed, 4 insertions, 3 deletions
diff --git a/lib/oxidized/config.rb b/lib/oxidized/config.rb index c850059..d2d12d8 100644 --- a/lib/oxidized/config.rb +++ b/lib/oxidized/config.rb @@ -5,6 +5,7 @@ module Oxidized class Config Root = File.join ENV['HOME'], '.config', 'oxidized' Crash = File.join Root, 'crash' + Log = File.join Root, 'log' InputDir = File.join Directory, %w(lib oxidized input) OutputDir = File.join Directory, %w(lib oxidized output) ModelDir = File.join Directory, %w(lib oxidized model) diff --git a/lib/oxidized/input/ftp.rb b/lib/oxidized/input/ftp.rb index 93cdb38..c6d644c 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(Oxidized::Config::Crash + "-#{@node.ip}-ftp", 'w') if Oxidized.config.input.debug? + @log = File.open(Oxidized::Config::Log + "-#{@node.ip}-ftp", 'w') if Oxidized.config.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 493f7bb..69b36b0 100644 --- a/lib/oxidized/input/ssh.rb +++ b/lib/oxidized/input/ssh.rb @@ -21,7 +21,7 @@ module Oxidized @output = '' @node.model.cfg['ssh'].each { |cb| instance_exec(&cb) } secure = Oxidized.config.input.ssh.secure - @log = File.open(Oxidized::Config::Crash + "-#{@node.ip}-ssh", 'w') if Oxidized.config.input.debug? + @log = File.open(Oxidized::Config::Log + "-#{@node.ip}-ssh", 'w') if Oxidized.config.input.debug? port = vars(:ssh_port) || 22 if proxy_host = vars(:proxy) proxy = Net::SSH::Proxy::Command.new("ssh #{proxy_host} nc %h %p") diff --git a/lib/oxidized/input/telnet.rb b/lib/oxidized/input/telnet.rb index e9fd7d9..3446ca2 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'] = Oxidized::Config::Crash + "-#{@node.ip}-telnet" if Oxidized.config.input.debug? + opt['Output_log'] = Oxidized::Config::Log + "-#{@node.ip}-telnet" if Oxidized.config.input.debug? @telnet = Net::Telnet.new opt if @node.auth[:username] and @node.auth[:username].length > 0 |