oxidized 0.29.1 → 0.30.0

data/lib/oxidized/model/ocnos.rb

@@ -0,0 +1,42 @@
+class OcNOS < Oxidized::Model
+  using Refinements
+
+  prompt /([\w.@-]+[#>]\s?)$/
+  comment '# '
+
+  cfg :ssh do
+    post_login 'terminal length 0'
+    pre_logout do
+      send "disable\r"
+      send "logout\r"
+    end
+  end
+
+  cmd :all do |cfg|
+    cfg.lines.to_a[1..-2].join
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show system fru' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show system-information board-info' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show forwarding profile limit' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show license' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+end

data/lib/oxidized/model/onefinity.rb

@@ -0,0 +1,18 @@
+class OneFinity < Oxidized::Model
+  using Refinements
+
+  # Fujitsu 1finity
+
+  prompt /(\r?[\w.@_()-]+[>]\s?)$/
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-3].join
+  end
+
+  cmd 'show configuration | display set | nomore'
+
+  cfg :ssh do
+    pre_logout 'exit'
+    exec true
+  end
+end

data/lib/oxidized/model/openbsd.rb

@@ -5,7 +5,7 @@ class Openbsd < Oxidized::Model
   # you can edit the one that your user uses, with root would be /root/.profile using the next PS1 def
   # export PS1="\033[32m\u@\h\033[00m:\033[36m\w\033[00m$ "
 
-  prompt /^.+@.+\:.+\$/
+  prompt /^.+@.+:.+\$/
   comment '# '
 
   # Add a comment between files/configs

data/lib/oxidized/model/opengear.rb

@@ -8,12 +8,47 @@ class OpenGear < Oxidized::Model
   cmd :secret do |cfg|
     cfg.gsub!(/password (\S+)/, 'password <secret removed>')
     cfg.gsub!(/community (\S+)/, 'community <secret removed>')
+    cfg.gsub!(/community=(\S+)/, 'community=<secret removed>')
+    cfg.gsub!(/private_key=(\S+)/, 'private_key=<secret removed>')
+    cfg.gsub!(/ key=(\S+)/, ' key=<secret removed>')
+    cfg.gsub!(/hashed_password=(\S+)/, 'hashed_password=<secret removed>')
     cfg
   end
 
   cmd('cat /etc/version') { |cfg| comment cfg }
 
-  cmd('config -g config') { |cfg| cfg }
+  # newer opengear firmware versions
+  cmd 'ogdeviceinfo -r' do |cfg|
+    comment cfg unless cfg.include? "ogdeviceinfo: command not found"
+  end
+
+  cmd 'config export' do |cfg|
+    unless cfg.include? "usage: config"
+      out = ''
+      cfg.each_line do |line|
+        out << line
+      end
+      out
+    end
+  end
+
+  # older opengear firmware versions
+  cmd 'showserial' do |cfg|
+    unless cfg.include? "showserial: command not found"
+      cfg.gsub! /^/, 'Serial Number: '
+      comment cfg
+    end
+  end
+
+  cmd 'config -g config' do |cfg|
+    unless cfg.include? "config: error: argument"
+      out = ''
+      cfg.each_line do |line|
+        out << line
+      end
+      out
+    end
+  end
 
   cfg :ssh do
     exec true # don't run shell, run each command in exec channel

data/lib/oxidized/model/opnsense.rb

@@ -18,7 +18,7 @@ class OpnSense < Oxidized::Model
   # that lack the opnsense-version command. Newer versions of OPNsense no longer
   # store the version information in this file, so both versions have to be
   # supported here for now.
-  cmd 'opnsense-version 2>/dev/null || echo "OPNsense "`cat /usr/local/opnsense/version/opnsense`' do |version|
+  cmd 'opnsense-version || echo "OPNsense "`cat /usr/local/opnsense/version/opnsense`' do |version|
     xmlcomment version
   end
 

data/lib/oxidized/model/panos.rb

@@ -18,6 +18,8 @@ class PanOS < Oxidized::Model
     cfg.gsub! /^threat-.*?: .*$/, ''
     cfg.gsub! /^wildfire-.*?: .*$/, ''
     cfg.gsub! /^wf-private.*?: .*$/, ''
+    cfg.gsub! /^device-dictionary-version.*?: .*$/, ''
+    cfg.gsub! /^device-dictionary-release-date.*?: .*$/, ''
     cfg.gsub! /^url-filtering.*?: .*$/, ''
     cfg.gsub! /^global-.*?: .*$/, ''
     comment cfg

data/lib/oxidized/model/pfsense.rb

@@ -15,6 +15,7 @@ class PfSense < Oxidized::Model
 
     cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
     cfg.gsub! /\s<last_rule_upd_time>\d*<\/last_rule_upd_time>/, ''
+    cfg.gsub! /\s<created>\s*<time>\d*<\/time>\s*.*CDATA\[Auto\].*\s*.*\s*<\/created>/, ''
     cfg
   end
 

data/lib/oxidized/model/procurve.rb

@@ -5,7 +5,7 @@ class Procurve < Oxidized::Model
   # ssh switches prompt may start with \r, followed by the prompt itself, regex ([\w\s.-]+[#>] ), which ends the line
   # telnet switches may start with various vt100 control characters, regex (\e\[24;[0-9][hH]), followed by the prompt, followed
   # by at least 3 other vt100 characters
-  prompt /(^\r|\e\[24;[0-9][hH])?([\w\s.-]+(\((config|vlan-[0-9]{1,4}|y\/n)\)|\(o\)nce)?[#>:?\]] {1,2})($|(\e\[24;[0-9][0-9]?[hH]){3})/
+  prompt /(^\r|\e\[24;[0-9][hH])?([\w\s.-]+[#>] )($|(\e\[24;[0-9][0-9]?[hH]){3})/
 
   comment '! '
 
@@ -36,6 +36,8 @@ class Procurve < Oxidized::Model
     cfg.gsub! /\e\[\??\d+(;\d+)*[A-Za-z]/, ''
     # Additional filtering for power usage reporting which obviously changes over time
     cfg.gsub! /^(.*AC [0-9]{3}V\/?([0-9]{3}V)?) *([0-9]{1,3}) (.*)/, '\\1 <removed> \\4'
+    # Remove failed commands that are not supported on all models
+    cfg.gsub! /^Invalid input: [A-Za-z-]+\n/, ''
     cfg
   end
 

data/lib/oxidized/model/rgos.rb

@@ -0,0 +1,33 @@
+class RGOS < Oxidized::Model
+  using Refinements
+
+  comment '! '
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(username .+ (password|secret) \d) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(enable (password|secret)( level \d+)?( \d)?) .+/, '\\1 <secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    cfg = cfg.each_line.reject { |line| line.match /^System start time/ }.join
+    cfg = cfg.each_line.reject { |line| line.match /^System uptime/ }.join
+    comment "#{cfg.cut_both}\n"
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg = cfg.each_line.reject { |line| line.match /^Building configuration.../ }.join
+    cfg = cfg.each_line.reject { |line| line.match /^Current configuration : \d+ bytes/ }.join
+    cfg = cfg.each_line.reject { |line| line.match /^version [\d\w()]+/ }.join
+    # remove empty lines
+    cfg = cfg.each_line.reject { |line| line.match /^[\r\n\s\u0000#]+$/ }.join
+    cfg.cut_both
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    post_login 'terminal width 0'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/routeros.rb

@@ -14,14 +14,14 @@ class RouterOS < Oxidized::Model
     cfg
   end
 
-  cmd '/system routerboard print without-paging' do |cfg|
+  cmd '/system routerboard print' do |cfg|
     cfg = cfg.each_line.grep(/(model|firmware-type|current-firmware|serial-number):/).join
     comment cfg
   end
 
-  cmd '/system package update print without-paging' do |cfg|
-    version_line = cfg.each_line.grep(/installed-version: /)[0]
-    @ros_version = /: ([0-9])/.match(version_line)[1].to_i
+  cmd '/system package update print' do |cfg|
+    version_line = cfg.each_line.grep(/installed-version:\s|current-version:\s/)[0]
+    @ros_version = /([0-9])/.match(version_line)[0].to_i
     comment version_line
   end
 
@@ -40,12 +40,14 @@ class RouterOS < Oxidized::Model
               end
     cmd run_cmd do |cfg|
       cfg.gsub! /\\\r?\n\s+/, '' # strip new line
-      cfg.gsub! /# inactive time\r\n/, '' # Remove time based system comment
+      cfg.gsub! "# inactive time\r\n", '' # Remove time based system comment
       cfg.gsub! /# received packet from \S+ bad format\r\n/, '' # Remove intermittent VRRP/CARP collision comment
-      cfg.gsub! /# poe-out status: short_circuit\r\n/, '' # Remove intermittent POE short_circuit comment
-      cfg.gsub! /# Firmware upgraded successfully, please reboot for changes to take effect!\r\n/, '' # Remove transient firmware upgrade comment
+      cfg.gsub! "# poe-out status: short_circuit\r\n", '' # Remove intermittent POE short_circuit comment
+      cfg.gsub! "# Firmware upgraded successfully, please reboot for changes to take effect!\r\n", '' # Remove transient firmware upgrade comment
       cfg.gsub! /# \S+ not ready\r\n/, '' # Remove intermittent $interface not ready comment
-      cfg = cfg.split("\n").reject { |line| line[/^#\s\w{3}\/\d{2}\/\d{4}.*$/] }
+      cfg = cfg.split("\n")
+      cfg.reject! { |line| line[/^#\s\w{3}\/\d{2}\/\d{4}.*$/] } # Remove date time and 'by RouterOS' comment (v6)
+      cfg.reject! { |line| line[/^#\s\d{4}-\d{2}-\d{2}.*$/] }   # Remove date time and 'by RouterOS' comment (v7)
       cfg.join("\n") + "\n"
     end
   end

data/lib/oxidized/model/slxos.rb

@@ -14,7 +14,7 @@ class SLXOS < Oxidized::Model
   cmd 'show chassis' do |cfg|
     cfg.encode!("UTF-8", invalid: :replace, undef: :replace) # sometimes ironware returns broken encoding
     cfg.gsub! /.*Power Usage.*/, '' # remove unwanted lines power usage
-    cfg.gsub! /^Update\:.*$/, '' # remove unwanted current date
+    cfg.gsub! /^Update:.*$/, '' # remove unwanted current date
     cfg.gsub! /Time A(live|wake).*/, '' # remove unwanted lines time alive/awake
     cfg.gsub! /([\[]*)1([\]]*)<->([\[]*)2([\]]*)(<->([\[]*)3([\]]*))*/, ''
 
@@ -31,7 +31,7 @@ class SLXOS < Oxidized::Model
 
   cmd 'show slots' do |cfg|
     cfg.gsub! /^-*^$/, '' # some slx devices are fixed config
-    cfg.gsub! /syntax error: element does not exist/, '' # same as above
+    cfg.gsub! "syntax error: element does not exist", '' # same as above
 
     comment cfg
   end

data/lib/oxidized/model/sonicos.rb

@@ -11,20 +11,21 @@ class SonicOS < Oxidized::Model
   end
 
   cmd :secret do |cfg|
-    cfg.gsub! /cli ftp password default \d\,(\S+)/, 'cli ftp password default <secret hidden> \2'
-    cfg.gsub! /secret \d\,(\S+)/, 'secret <secret hidden> \2'
-    cfg.gsub! /shared-secret \d\,(\S+)/, 'shared-secret <secret hidden> \2'
-    cfg.gsub! /password \d\,(\S+)/, 'password <secret hidden> \2'
-    cfg.gsub! /passphrase password \d\,(\S+)/, 'passphrase password <secret hidden> \2'
-    cfg.gsub! /bind-password \d\,(\S+)/, 'bind-password <secret hidden> \2'
-    cfg.gsub! /authentication sha1 \d\,(\S+)/, 'authentication sha1 <secret hidden> \2'
-    cfg.gsub! /encryption aes \d\,(\S+)/, 'encryption aes <secret hidden> \2'
-    cfg.gsub! /smtp-pass \d\,(\S+)/, 'smtp-pass <secret hidden> \2'
-    cfg.gsub! /pop-pass \d\,(\S+)/, 'pop-pass <secret hidden> \2'
-    cfg.gsub! /sslvpn password \d\,(\S+)/, 'sslvpn password <secret hidden> \2'
-    cfg.gsub! /administrator password \d\,(\S+)/, 'administrator password <secret hidden> \2'
-    cfg.gsub! /ftp password \d\,(\S+)/, 'ftp password <secret hidden> \2'
-    cfg.gsub! /shared-key \d\,(\S+)/, 'shared-key <secret hidden> \2'
+    cfg.gsub! /cli ftp password default \d,(\S+)/, 'cli ftp password default <secret hidden> \2'
+    cfg.gsub! /secret \d,(\S+)/, 'secret <secret hidden> \2'
+    cfg.gsub! /shared-secret \d,(\S+)/, 'shared-secret <secret hidden> \2'
+    cfg.gsub! /password \d,(\S+)/, 'password <secret hidden> \2'
+    cfg.gsub! /passphrase password \d,(\S+)/, 'passphrase password <secret hidden> \2'
+    cfg.gsub! /bind-password \d,(\S+)/, 'bind-password <secret hidden> \2'
+    cfg.gsub! /authentication sha1 \d,(\S+)/, 'authentication sha1 <secret hidden> \2'
+    cfg.gsub! /encryption aes \d,(\S+)/, 'encryption aes <secret hidden> \2'
+    cfg.gsub! /smtp-pass \d,(\S+)/, 'smtp-pass <secret hidden> \2'
+    cfg.gsub! /pop-pass \d,(\S+)/, 'pop-pass <secret hidden> \2'
+    cfg.gsub! /sslvpn password \d,(\S+)/, 'sslvpn password <secret hidden> \2'
+    cfg.gsub! /administrator password \d,(\S+)/, 'administrator password <secret hidden> \2'
+    cfg.gsub! /ftp password \d,(\S+)/, 'ftp password <secret hidden> \2'
+    cfg.gsub! /shared-key \d,(\S+)/, 'shared-key <secret hidden> \2'
+    cfg.gsub! /wpa passphrase \d,(\S+)/, 'wpa passphrase <secret hidden> \2'
     cfg
   end
 
@@ -46,9 +47,9 @@ class SonicOS < Oxidized::Model
   def clean(cfg)
     out = []
     cfg.each_line do |line|
-      next if line =~ /date \d{4}\:\d{2}\:\d{2}/
-      next if line =~ /time \d{2}\:\d{2}:\d{2}/
-      next if line =~ /system-time \"\d{2}\/\d{2}\/\d{4} \d{2}\:\d{2}:\d{2}.\d+\"/
+      next if line =~ /date \d{4}:\d{2}:\d{2}/
+      next if line =~ /time \d{2}:\d{2}:\d{2}/
+      next if line =~ /system-time "\d{2}\/\d{2}\/\d{4} \d{2}:\d{2}:\d{2}.\d+"/
       next if line =~ /system-uptime "((\s+up\s+\d+\s+)|(\d+\s\w+(,\s)?)*)"/
       next if line =~ /checksum \d+/
 

data/lib/oxidized/model/sros.rb

@@ -32,7 +32,7 @@ class SROS < Oxidized::Model
     #
     # Strip uptime.
     #
-    cfg.sub! /^System Up Time.*\n/, ''
+    cfg.gsub! /^System Up Time.*$/, ''
     comment cfg
   end
 
@@ -75,14 +75,14 @@ class SROS < Oxidized::Model
   #
   # Show the running persistent indices.
   #
-  cmd 'admin display-config index' do |cfg|
+  cmd "admin display-config index\n" do |cfg|
     comment cfg
   end
 
   #
   # Show the running configuration.
   #
-  cmd 'admin display-config' do |cfg|
+  cmd "admin display-config\n" do |cfg|
     cfg
   end
 

data/lib/oxidized/model/tplink.rb

@@ -54,9 +54,10 @@ class TPLink < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    if vars :enable
-      post_login do
-        send "enable\r"
+    post_login do
+      if vars(:enable) == true
+        cmd "enable"
+      elsif vars(:enable)
         cmd vars(:enable)
       end
     end

data/lib/oxidized/model/truenas.rb

@@ -8,7 +8,8 @@ class TrueNAS < Oxidized::Model
   cmd('sqlite3 "file:///data/freenas-v1.db?mode=ro&immutable=1" .dump') do |cfg|
     cfg.lines.reject do |line|
       line.match(/^INSERT INTO storage_replication /) ||
-        line.match(/^INSERT INTO system_alert /)
+        line.match(/^INSERT INTO system_alert /) || # ignore system alerts in db
+        line.match(/^INSERT INTO sqlite_sequence VALUES\('system_alert',/) # ignore system alerts in db
     end.join
   end
 

data/lib/oxidized/model/vrp.rb

@@ -27,15 +27,17 @@ class VRP < Oxidized::Model
   end
 
   cmd 'display version' do |cfg|
-    cfg = cfg.each_line.reject { |l| l.match /uptime/ }.join
+    cfg = cfg.each_line.reject { |l| l.match /uptime|^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d\d\d)? ?(\+\d\d:\d\d)?$/ }.join
     comment cfg
   end
 
   cmd 'display device' do |cfg|
+    cfg = cfg.each_line.reject { |l| l.match /^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d\d\d)? ?(\+\d\d:\d\d)?$/ }.join
     comment cfg
   end
 
   cmd 'display current-configuration all' do |cfg|
+    cfg = cfg.each_line.reject { |l| l.match /^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d\d\d)? ?(\+\d\d:\d\d)?$/ }.join
     cfg
   end
 end

data/lib/oxidized/model/vyatta.rb

@@ -15,9 +15,15 @@ class Vyatta < Oxidized::Model
     cfg.gsub! /password (\S+).*/, 'password <secret removed>'
     cfg.gsub! /pre-shared-secret (\S+).*/, 'pre-shared-secret <secret removed>'
     cfg.gsub! /community (\S+) {/, 'community <hidden> {'
+    cfg.gsub! /private-key (\S+).*/, 'private-key <secret removed>'
+    cfg.gsub! /preshared-key (\S+).*/, 'preshared-key <secret removed>'
     cfg
   end
 
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
   cmd 'show configuration commands | no-more'
 
   cfg :telnet do

data/lib/oxidized/model/zynos.rb

@@ -1,12 +1,76 @@
 class ZyNOS < Oxidized::Model
   using Refinements
 
-  # Used in Zyxel DSLAMs, such as SAM1316
+  prompt /^([\w.@()-<]+[#>]\s?)$/
+  # if there is something you can not identify after prompt, uncomment next line and comment previous line
+  # prompt /^([\w.@()-<]+[#>]\s?).*$/
 
   comment '! '
 
-  cmd 'config-0'
+  # Used in Zyxel DSLAMs, such as SAM1316. Uncomment next line to enable ftp.
+  # cmd 'config-0'
 
-  cfg :ftp do
+  # replace next line control sequence with a new line
+  expect /(\e\[1M\e\[\??\d+(;\d+)*[A-Za-z]\e\[1L)|(\eE)/ do |data, re|
+    data.gsub re, "\n"
+  end
+
+  # replace all used vt100 control sequences
+  expect /\e\[\??\d+(;\d+)*[A-Za-z]/ do |data, re|
+    data.gsub re, ''
+  end
+
+  # ignore copyright motd
+  expect /^(Copyright .*)\n^([\w.@()-<]+[#>]\s?)$/ do
+    send '\n'
+    ""
+  end
+
+  cmd :all do |cfg|
+    cfg = cfg.gsub /^\r/, ''
+    # Additional filtering for elder switches sending vt100 control chars via telnet
+    cfg.gsub! /\e\[\??\d+(;\d+)*[A-Za-z]/, ''
+    cfg
+  end
+
+  # remove snmp community, username, password and admin-password
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server get-community) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(snmp-server set-community) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(logins username) \S+(.*) (password) \S+(.*)/, '\\1 <secret hidden> \\2 \\3 <secret hidden> \\4'
+    cfg.gsub! /^(admin-password) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(password) \S+(.*) (privilege \S+)/, '\\1 <secret hidden> \\2 \\3'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show system-information' do |cfg|
+    cfg.gsub! /^([Ss]ystem up [Tt]ime\s*:)(.*)/, '\\1 <time removed>'
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg = cfg.split("\n")[4..-2].join("\n")
+    cfg
+  end
+
+  cfg :telnet do
+    username /^User name:/i
+    password /^Password:/i
+  end
+
+  cfg :telnet, :ssh do
+    post_login do
+      if vars(:enable) == true
+        cmd "enable"
+      elsif vars(:enable)
+        cmd "enable", /^[pP]assword:/
+        cmd vars(:enable)
+      end
+    end
+    pre_logout 'exit'
   end
 end

data/lib/oxidized/model/zynosadsl.rb

@@ -0,0 +1,14 @@
+class ZyNOSADSL < Oxidized::Model
+  using Refinements
+
+  # Used in Zyxel ADSL, such as AAM1212-51
+
+  prompt /^.*>\s?$/
+  comment ';; '
+
+  cmd 'config show all nopause'
+
+  cfg :telnet do
+    password /^Password:/i
+  end
+end

data/lib/oxidized/model/zynosgs.rb

@@ -18,6 +18,8 @@ class ZyNOSGS < Oxidized::Model
     # Remove garbage vt100 control sequences
     # Backspace 0x07 char or escape char + control chars
     cfg.gsub! /[\b]|\e\[A|\e\[2K/, ''
+    # Remove empty lines
+    cfg.gsub! "\n\n", "\n"
     cfg
   end
 

data/lib/oxidized/model/zynosmgs.rb

@@ -0,0 +1,32 @@
+class ZyNOSMGS < Oxidized::Model
+  using Refinements
+
+  PROMPT = /^(\w.*)>(.*)?$/
+  # Used in Zyxel MGS Series switches
+
+  prompt PROMPT
+  comment '! '
+
+  cmd 'show version' do |cfg|
+    clear_output cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    clear_output cfg
+  end
+
+  cfg :telnet do
+    username /^User\s?name(\(1-32 chars\))?:/i
+    password /^Password(\(1-32 chars\))?:/i
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout 'exit'
+  end
+
+  private
+
+  def clear_output(output)
+    output.gsub PROMPT, ''
+  end
+end

data/lib/oxidized/node.rb

@@ -59,7 +59,7 @@ module Oxidized
 
     def run_input(input)
       rescue_fail = {}
-      [input.class::RescueFail, input.class.superclass::RescueFail].each do |hash|
+      [input.class::RESCUE_FAIL, input.class.superclass::RESCUE_FAIL].each do |hash|
         hash.each do |level, errors|
           errors.each do |err|
             rescue_fail[err] = level
@@ -79,20 +79,20 @@ module Oxidized
         @err_type = err.class.to_s
         @err_reason = err.message.to_s
         false
-      rescue StandardError => err
+      rescue StandardError => e
         crashdir  = Oxidized.config.crash.directory
         crashfile = Oxidized.config.crash.hostnames? ? name : ip.to_s
         FileUtils.mkdir_p(crashdir) unless File.directory?(crashdir)
 
         File.open File.join(crashdir, crashfile), 'w' do |fh|
           fh.puts Time.now.utc
-          fh.puts err.message + ' [' + err.class.to_s + ']'
+          fh.puts e.message + ' [' + e.class.to_s + ']'
           fh.puts '-' * 50
-          fh.puts err.backtrace
+          fh.puts e.backtrace
         end
-        Oxidized.logger.error '%s raised %s with msg "%s", %s saved' % [ip, err.class, err.message, crashfile]
-        @err_type = err.class.to_s
-        @err_reason = err.message.to_s
+        Oxidized.logger.error '%s raised %s with msg "%s", %s saved' % [ip, e.class, e.message, crashfile]
+        @err_type = e.class.to_s
+        @err_reason = e.message.to_s
         false
       end
     end

data/lib/oxidized/nodes.rb

@@ -1,8 +1,8 @@
 module Oxidized
   require 'ipaddr'
   require 'oxidized/node'
-  class Oxidized::NotSupported < OxidizedError; end
-  class Oxidized::NodeNotFound < OxidizedError; end
+  class NotSupported < OxidizedError; end
+  class NodeNotFound < OxidizedError; end
 
   class Nodes < Array
     attr_accessor :source, :jobs
@@ -21,10 +21,10 @@ module Oxidized
           begin
             node_obj = Node.new node
             new.push node_obj
-          rescue ModelNotFound => err
-            Oxidized.logger.error "node %s raised %s with message '%s'" % [node, err.class, err.message]
-          rescue Resolv::ResolvError => err
-            Oxidized.logger.error "node %s is not resolvable, raised %s with message '%s'" % [node, err.class, err.message]
+          rescue ModelNotFound => e
+            Oxidized.logger.error "node %s raised %s with message '%s'" % [node, e.class, e.message]
+          rescue Resolv::ResolvError => e
+            Oxidized.logger.error "node %s is not resolvable, raised %s with message '%s'" % [node, e.class, e.message]
           end
         end
         size.zero? ? replace(new) : update_nodes(new)
@@ -80,7 +80,7 @@ module Oxidized
         # set last job to nil so that the node is picked for immediate update
         n.last = nil
         put n
-        jobs.want += 1 if Oxidized.config.next_adds_job?
+        jobs.increment if Oxidized.config.next_adds_job?
       end
     end
     alias top next
@@ -95,7 +95,7 @@ module Oxidized
     # @param node node whose index number in Nodes to find
     # @return [Fixnum] index number of node in Nodes
     def find_node_index(node)
-      find_index(node) || raise(Oxidized::NodeNotFound, "unable to find '#{node}'")
+      find_index(node) || raise(NodeNotFound, "unable to find '#{node}'")
     end
 
     def version(node_name, group)
@@ -129,8 +129,8 @@ module Oxidized
       end
     end
 
-    def with_lock(&block)
-      @mutex.synchronize(&block)
+    def with_lock(...)
+      @mutex.synchronize(...)
     end
 
     def find_index(node)
@@ -160,13 +160,18 @@ module Oxidized
     # @param [Array] nodes Array of nodes used to replace+update old
     def update_nodes(nodes)
       old = dup
+      # load the Array "nodes" in self (the class Nodes inherits Array)
       replace(nodes)
       each do |node|
         if (i = old.find_node_index(node.name))
           node.stats = old[i].stats
           node.last  = old[i].last
         end
-      rescue Oxidized::NodeNotFound
+      rescue NodeNotFound
+        # Do nothing:
+        # when a node is not found, we have nothing to do:
+        # it has already been loaded by replace(nodes) and there are no
+        # stats to copy
       end
       sort_by! { |x| x.last.nil? ? Time.new(0) : x.last.end }
     end
@@ -175,7 +180,7 @@ module Oxidized
       with_lock do
         node = find { |n| n.name == node_name }
         output = node.output.new
-        raise Oxidized::NotSupported unless output.respond_to? :fetch
+        raise NotSupported unless output.respond_to? :fetch
 
         yield node, output
       end