summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSaku Ytti <saku@ytti.fi>2015-09-06 11:01:41 +0300
committerSaku Ytti <saku@ytti.fi>2015-09-06 11:01:41 +0300
commit15d1452f5f78fde4817b6b58963bf720ca1cbd01 (patch)
tree7d7be725c3059f2e7f5c144085a115fb02b9d7a7 /lib
parent9844a72c0487d33c38d435363998dcab27373be6 (diff)
oops, presedence issue
Diffstat (limited to 'lib')
-rw-r--r--lib/oxidized/input/ssh.rb2
-rw-r--r--lib/oxidized/input/telnet.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index 815b8af..d6b4e1f 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -21,7 +21,7 @@ module Oxidized
@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?
- port = vars(:ssh_port) or 22
+ 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,
:paranoid => secure,
diff --git a/lib/oxidized/input/telnet.rb b/lib/oxidized/input/telnet.rb
index 52d6a53..d305fcd 100644
--- a/lib/oxidized/input/telnet.rb
+++ b/lib/oxidized/input/telnet.rb
@@ -10,7 +10,7 @@ module Oxidized
@node = node
@timeout = CFG.timeout
@node.model.cfg['telnet'].each { |cb| instance_exec(&cb) }
- port = vars(:telnet_port) or 23
+ port = vars(:telnet_port) || 23
opt = { 'Host' => @node.ip,
'Port' => port.to_i,