ohai 15.0.35 → 15.1.3

data/lib/ohai/plugins/dragonflybsd/network.rb

@@ -22,9 +22,9 @@ Ohai.plugin(:Network) do
 
   collect_data(:dragonflybsd) do
     network Mash.new unless network
-    network[:interfaces] = Mash.new unless network[:interfaces]
+    network[:interfaces] ||= Mash.new
     counters Mash.new unless counters
-    counters[:network] = Mash.new unless counters[:network]
+    counters[:network] ||= Mash.new
 
     so = shell_out("route -n get default")
     so.stdout.lines do |line|
@@ -52,11 +52,11 @@ Ohai.plugin(:Network) do
       end
       # call the family lladdr to match linux for consistency
       if line =~ /\s+ether (.+?)\s/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         iface[cint][:addresses][$1] = { "family" => "lladdr" }
       end
       if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         # convert the netmask to decimal for consistency
         netmask = "#{$2[2, 2].hex}.#{$2[4, 2].hex}.#{$2[6, 2].hex}.#{$2[8, 2].hex}"
         if $3.empty?
@@ -67,7 +67,7 @@ Ohai.plugin(:Network) do
         end
       end
       if line =~ /\s+inet6 ([a-f0-9\:]+)%?(\w*)\s+prefixlen\s+(\d+)\s*\w*\s*([\da-fx]*)/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         if $4.empty?
           iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $3 }
         else
@@ -89,7 +89,7 @@ Ohai.plugin(:Network) do
     so.stdout.lines do |line|
       if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
         next unless iface[$3] # this should never happen
-        iface[$3][:arp] = Mash.new unless iface[$3][:arp]
+        iface[$3][:arp] ||= Mash.new
         iface[$3][:arp][$1] = $2.downcase
       end
     end
@@ -107,9 +107,9 @@ Ohai.plugin(:Network) do
       # ed0    1500 <Link#1>      54:52:00:68:92:85   333604    26  151905886   175472     0   24897542     0  905
       # $1                        $2                      $3    $4         $5       $6    $7         $8    $9  $10
       if line =~ /^([\w\.\*]+)\s+\d+\s+<Link#\d+>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
-        net_counters[$1] = Mash.new unless net_counters[$1]
-        net_counters[$1]["rx"] = Mash.new unless net_counters[$1]["rx"]
-        net_counters[$1]["tx"] = Mash.new unless net_counters[$1]["tx"]
+        net_counters[$1] ||= Mash.new
+        net_counters[$1]["rx"] ||= Mash.new
+        net_counters[$1]["tx"] ||= Mash.new
         net_counters[$1]["rx"]["packets"] = $3
         net_counters[$1]["rx"]["errors"] = $4
         net_counters[$1]["rx"]["bytes"] = $5

data/lib/ohai/plugins/ec2.rb

@@ -26,8 +26,8 @@
 # 4. Kernel data mentioned Amazon. This catches Windows HVM & paravirt instances
 
 Ohai.plugin(:EC2) do
-  require "ohai/mixin/ec2_metadata"
-  require "ohai/mixin/http_helper"
+  require_relative "../mixin/ec2_metadata"
+  require_relative "../mixin/http_helper"
   require "base64"
 
   include Ohai::Mixin::Ec2Metadata

data/lib/ohai/plugins/eucalyptus.rb

@@ -19,8 +19,8 @@
 
 Ohai.plugin(:Eucalyptus) do
   # eucalyptus metadata service is compatible with the ec2 service calls
-  require "ohai/mixin/ec2_metadata"
-  require "ohai/mixin/http_helper"
+  require_relative "../mixin/ec2_metadata"
+  require_relative "../mixin/http_helper"
 
   include Ohai::Mixin::Ec2Metadata
   include Ohai::Mixin::HttpHelper

data/lib/ohai/plugins/filesystem.rb

@@ -65,7 +65,7 @@ Ohai.plugin(:Filesystem) do
   def generate_device_view(fs)
     view = {}
     fs.each_value do |entry|
-      view[entry[:device]] = Mash.new unless view[entry[:device]]
+      view[entry[:device]] ||= Mash.new
       entry.each do |key, val|
         next if %w{device mount}.include?(key)
         view[entry[:device]][key] = val
@@ -82,7 +82,7 @@ Ohai.plugin(:Filesystem) do
     view = {}
     fs.each_value do |entry|
       next unless entry[:mount]
-      view[entry[:mount]] = Mash.new unless view[entry[:mount]]
+      view[entry[:mount]] ||= Mash.new
       entry.each do |key, val|
         next if %w{mount device}.include?(key)
         view[entry[:mount]][key] = val
@@ -182,7 +182,7 @@ Ohai.plugin(:Filesystem) do
       so.stdout.each_line do |line|
         if line =~ /^(.+?) on (.+?) type (.+?) \((.+?)\)$/
           key = "#{$1},#{$2}"
-          fs[key] = Mash.new unless fs.key?(key)
+          fs[key] ||= Mash.new
           fs[key][:device] = $1
           fs[key][:mount] = $2
           fs[key][:fs_type] = $3
@@ -380,7 +380,7 @@ Ohai.plugin(:Filesystem) do
       so.stdout.lines do |line|
         if line =~ /^(.+?) on (.+?) \((.+?), (.+?)\)$/
           key = "#{$1},#{$2}"
-          fs[key] = Mash.new unless fs.key?(key)
+          fs[key] ||= Mash.new
           fs[key][:mount] = $2
           fs[key][:fs_type] = $3
           fs[key][:mount_options] = $4.split(/,\s*/)
@@ -426,7 +426,7 @@ Ohai.plugin(:Filesystem) do
       so.stdout.lines do |line|
         next unless line =~ /^(.+?) on (.+?) (.+?) on (.+?)$/
         key = "#{$2},#{$1}"
-        fs[key] = Mash.new unless fs.key?(key)
+        fs[key] ||= Mash.new
         fs[key][:mount] = $1
         fs[key][:mount_time] = $4 # $4 must come before "split", else it becomes nil
         fs[key][:mount_options] = $3.split("/")

data/lib/ohai/plugins/freebsd/network.rb

@@ -22,9 +22,9 @@ Ohai.plugin(:Network) do
 
   collect_data(:freebsd) do
     network Mash.new unless network
-    network[:interfaces] = Mash.new unless network[:interfaces]
+    network[:interfaces] ||= Mash.new
     counters Mash.new unless counters
-    counters[:network] = Mash.new unless counters[:network]
+    counters[:network] ||= Mash.new
 
     so = shell_out("route -n get default")
     so.stdout.lines do |line|
@@ -52,11 +52,11 @@ Ohai.plugin(:Network) do
       end
       # call the family lladdr to match linux for consistency
       if line =~ /\s+ether (.+?)\s/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         iface[cint][:addresses][$1] = { "family" => "lladdr" }
       end
       if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         # convert the netmask to decimal for consistency
         netmask = "#{$2[2, 2].hex}.#{$2[4, 2].hex}.#{$2[6, 2].hex}.#{$2[8, 2].hex}"
         if $3.empty?
@@ -67,7 +67,7 @@ Ohai.plugin(:Network) do
         end
       end
       if line =~ /\s+inet6 ([a-f0-9\:]+)%?(\w*)\s+prefixlen\s+(\d+)\s*\w*\s*([\da-fx]*)/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         if $4.empty?
           iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $3 }
         else
@@ -89,7 +89,7 @@ Ohai.plugin(:Network) do
     so.stdout.lines do |line|
       if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
         next unless iface[$3] # this should never happen
-        iface[$3][:arp] = Mash.new unless iface[$3][:arp]
+        iface[$3][:arp] ||= Mash.new
         iface[$3][:arp][$1] = $2.downcase
       end
     end
@@ -107,9 +107,9 @@ Ohai.plugin(:Network) do
       # ed0    1500 <Link#1>      54:52:00:68:92:85   333604    26  151905886   175472     0   24897542     0  905
       # $1                        $2                      $3    $4         $5       $6    $7         $8    $9  $10
       if line =~ /^([\w\.\*]+)\s+\d+\s+<Link#\d+>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
-        net_counters[$1] = Mash.new unless net_counters[$1]
-        net_counters[$1]["rx"] = Mash.new unless net_counters[$1]["rx"]
-        net_counters[$1]["tx"] = Mash.new unless net_counters[$1]["tx"]
+        net_counters[$1] ||= Mash.new
+        net_counters[$1]["rx"] ||= Mash.new
+        net_counters[$1]["tx"] ||= Mash.new
         net_counters[$1]["rx"]["packets"] = $3
         net_counters[$1]["rx"]["errors"] = $4
         net_counters[$1]["rx"]["bytes"] = $5

data/lib/ohai/plugins/gce.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 
 Ohai.plugin(:GCE) do
-  require "ohai/mixin/gce_metadata"
-  require "ohai/mixin/http_helper"
+  require_relative "../mixin/gce_metadata"
+  require_relative "../mixin/http_helper"
 
   include Ohai::Mixin::GCEMetadata
   include Ohai::Mixin::HttpHelper

data/lib/ohai/plugins/hostname.rb

@@ -26,7 +26,7 @@
 #
 
 Ohai.plugin(:Hostname) do
-  require "socket"
+  require "socket" unless defined?(Socket)
   require "ipaddr"
 
   provides "domain", "hostname", "fqdn", "machinename"
@@ -161,7 +161,7 @@ Ohai.plugin(:Hostname) do
 
   collect_data(:windows) do
     require "wmi-lite/wmi"
-    require "socket"
+    require "socket" unless defined?(Socket)
 
     wmi = WmiLite::Wmi.new
     host = wmi.first_of("Win32_ComputerSystem")

data/lib/ohai/plugins/kernel.rb

@@ -247,7 +247,7 @@ Ohai.plugin(:Kernel) do
   end
 
   collect_data(:windows) do
-    require "win32ole"
+    require "win32ole" unless defined?(WIN32OLE)
     require "wmi-lite/wmi"
 
     WIN32OLE.codepage = WIN32OLE::CP_UTF8

data/lib/ohai/plugins/linux/fips.rb

@@ -28,7 +28,7 @@ Ohai.plugin(:Fips) do
   collect_data(:linux) do
     fips Mash.new
 
-    require "openssl"
+    require "openssl" unless defined?(OpenSSL)
     if defined?(OpenSSL.fips_mode) && OpenSSL.fips_mode && !$FIPS_TEST_MODE
       fips["kernel"] = { "enabled" => true }
     else

data/lib/ohai/plugins/linux/network.rb

@@ -58,7 +58,7 @@ Ohai.plugin(:Network) do
           logger.warn("neighbor list has entries for unknown interface #{interface}")
           next
         end
-        interface[neigh_attr] = Mash.new unless interface[neigh_attr]
+        interface[neigh_attr] ||= Mash.new
         interface[neigh_attr][$1] = $3.downcase
       end
     end
@@ -208,8 +208,8 @@ Ohai.plugin(:Network) do
     so.stdout.lines do |line|
       if line =~ IPROUTE_INT_REGEX
         tmp_int = $2
-        iface[tmp_int] = Mash.new unless iface[tmp_int]
-        net_counters[tmp_int] = Mash.new unless net_counters[tmp_int]
+        iface[tmp_int] ||= Mash.new
+        net_counters[tmp_int] ||= Mash.new
       end
 
       if line =~ /^\s+(ip6tnl|ipip)/
@@ -239,7 +239,7 @@ Ohai.plugin(:Network) do
 
       if line =~ /(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
         int = on_rx ? :rx : :tx
-        net_counters[tmp_int][int] = Mash.new unless net_counters[tmp_int][int]
+        net_counters[tmp_int][int] ||= Mash.new
         net_counters[tmp_int][int][:bytes] = $1
         net_counters[tmp_int][int][:packets] = $2
         net_counters[tmp_int][int][:errors] = $3
@@ -255,7 +255,7 @@ Ohai.plugin(:Network) do
       end
 
       if line =~ /qlen (\d+)/
-        net_counters[tmp_int][:tx] = Mash.new unless net_counters[tmp_int][:tx]
+        net_counters[tmp_int][:tx] ||= Mash.new
         net_counters[tmp_int][:tx][:queuelen] = $1
       end
 
@@ -266,7 +266,7 @@ Ohai.plugin(:Network) do
         else
           tmp_id = $1
         end
-        iface[tmp_int][:vlan] = Mash.new unless iface[tmp_int][:vlan]
+        iface[tmp_int][:vlan] ||= Mash.new
         iface[tmp_int][:vlan][:id] = tmp_id
         iface[tmp_int][:vlan][:protocol] = tmp_prot if tmp_prot
 
@@ -320,7 +320,7 @@ Ohai.plugin(:Network) do
     if line =~ /link\/(\w+) ([\da-f\:]+) /
       iface[cint][:encapsulation] = linux_encaps_lookup($1)
       unless $2 == "00:00:00:00:00:00"
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         iface[cint][:addresses][$2.upcase] = { "family" => "lladdr" }
       end
     end
@@ -340,8 +340,8 @@ Ohai.plugin(:Network) do
         cint = alias_int
       end
 
-      iface[cint] = Mash.new unless iface[cint] # Create the fake alias interface if needed
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+      iface[cint] ||= Mash.new # Create the fake alias interface if needed
+      iface[cint][:addresses] ||= Mash.new
       iface[cint][:addresses][tmp_addr] = { "family" => "inet", "prefixlen" => tmp_prefix }
       iface[cint][:addresses][tmp_addr][:netmask] = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
 
@@ -365,7 +365,7 @@ Ohai.plugin(:Network) do
 
   def parse_ip_addr_inet6_line(cint, iface, line)
     if line =~ /inet6 ([a-f0-9\:]+)\/(\d+) scope (\w+)( .*)?/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+      iface[cint][:addresses] ||= Mash.new
       tmp_addr = $1
       tags = $4 || ""
       tags = tags.split(" ")
@@ -476,9 +476,9 @@ Ohai.plugin(:Network) do
     net_counters = Mash.new
 
     network Mash.new unless network
-    network[:interfaces] = Mash.new unless network[:interfaces]
+    network[:interfaces] ||= Mash.new
     counters Mash.new unless counters
-    counters[:network] = Mash.new unless counters[:network]
+    counters[:network] ||= Mash.new
 
     # ohai.plugin[:network][:default_route_table] = 'default'
     if configuration(:default_route_table).nil? || configuration(:default_route_table).empty?
@@ -491,7 +491,7 @@ Ohai.plugin(:Network) do
     # Match the lead line for an interface from iproute2
     # 3: eth0.11@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP
     # The '@eth0:' portion doesn't exist on primary interfaces and thus is optional in the regex
-    IPROUTE_INT_REGEX = /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z]+|):\s/.freeze unless defined? IPROUTE_INT_REGEX
+    IPROUTE_INT_REGEX ||= /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z]+|):\s/.freeze
 
     if which("ip")
       # families to get default routes from
@@ -597,16 +597,16 @@ Ohai.plugin(:Network) do
           iface[cint][:encapsulation] = linux_encaps_lookup($1)
         end
         if line =~ /HWaddr (.+?)\s/
-          iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+          iface[cint][:addresses] ||= Mash.new
           iface[cint][:addresses][$1] = { "family" => "lladdr" }
         end
         if line =~ /inet addr:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
-          iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+          iface[cint][:addresses] ||= Mash.new
           iface[cint][:addresses][$1] = { "family" => "inet" }
           tmp_addr = $1
         end
         if line =~ /inet6 addr: ([a-f0-9\:]+)\/(\d+) Scope:(\w+)/
-          iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+          iface[cint][:addresses] ||= Mash.new
           iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $2, "scope" => ($3.eql?("Host") ? "Node" : $3) }
         end
         if line =~ /Bcast:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
@@ -626,7 +626,7 @@ Ohai.plugin(:Network) do
           iface[cint][:peer] = $1
         end
         if line =~ /RX packets:(\d+) errors:(\d+) dropped:(\d+) overruns:(\d+) frame:(\d+)/
-          net_counters[cint] = Mash.new unless net_counters[cint]
+          net_counters[cint] ||= Mash.new
           net_counters[cint][:rx] = { "packets" => $1, "errors" => $2, "drop" => $3, "overrun" => $4, "frame" => $5 }
         end
         if line =~ /TX packets:(\d+) errors:(\d+) dropped:(\d+) overruns:(\d+) carrier:(\d+)/
@@ -650,7 +650,7 @@ Ohai.plugin(:Network) do
       so.stdout.lines do |line|
         if line =~ /^\S+ \((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) \[(\w+)\] on ([0-9a-zA-Z\.\:\-]+)/
           next unless iface[$4] # this should never happen
-          iface[$4][:arp] = Mash.new unless iface[$4][:arp]
+          iface[$4][:arp] ||= Mash.new
           iface[$4][:arp][$1] = $2.downcase
         end
       end

data/lib/ohai/plugins/linux/platform.rb

@@ -23,8 +23,7 @@ Ohai.plugin(:Platform) do
   # the platform mappings between the 'ID' field in /etc/os-release and the value
   # ohai uses. If you're adding a new platform here and you want to change the name
   # you'll want to add it here and then add a spec for the platform_id_remap method
-  unless defined?(PLATFORM_MAPPINGS)
-    PLATFORM_MAPPINGS = {
+  PLATFORM_MAPPINGS ||= {
       "rhel" => "redhat",
       "amzn" => "amazon",
       "ol" => "oracle",
@@ -34,7 +33,6 @@ Ohai.plugin(:Platform) do
       "xenenterprise" => "xenserver",
       "cumulus-linux" => "cumulus",
     }.freeze
-  end
 
   # @deprecated
   def get_redhatish_platform(contents)

data/lib/ohai/plugins/linux/sessions.rb

@@ -28,8 +28,8 @@ Ohai.plugin(:Sessions) do
       loginctl = shell_out(cmd)
 
       sessions Mash.new unless sessions
-      sessions[:by_session] = Mash.new unless sessions[:by_session]
-      sessions[:by_user] = Mash.new unless sessions[:by_user]
+      sessions[:by_session] ||= Mash.new
+      sessions[:by_user] ||= Mash.new
 
       loginctl.stdout.split("\n").each do |line|
         session, uid, user, seat = line.split

data/lib/ohai/plugins/linux/virtualization.rb

@@ -19,7 +19,7 @@
 Ohai.plugin(:Virtualization) do
   provides "virtualization"
   depends "dmi"
-  require "ohai/mixin/dmi_decode"
+  require_relative "../../mixin/dmi_decode"
   include Ohai::Mixin::DmiDecode
 
   def lxc_version_exists?
@@ -36,7 +36,7 @@ Ohai.plugin(:Virtualization) do
 
   collect_data(:linux) do
     virtualization Mash.new unless virtualization
-    virtualization[:systems] = Mash.new unless virtualization[:systems]
+    virtualization[:systems] ||= Mash.new
 
     # Docker hosts
     if docker_exists?

data/lib/ohai/plugins/netbsd/network.rb

@@ -22,9 +22,9 @@ Ohai.plugin(:Network) do
 
   collect_data(:netbsd) do
     network Mash.new unless network
-    network[:interfaces] = Mash.new unless network[:interfaces]
+    network[:interfaces] ||= Mash.new
     counters Mash.new unless counters
-    counters[:network] = Mash.new unless counters[:network]
+    counters[:network] ||= Mash.new
 
     so = shell_out("route -n get default")
     so.stdout.lines do |line|
@@ -52,11 +52,11 @@ Ohai.plugin(:Network) do
       end
       # call the family lladdr to match linux for consistency
       if line =~ /\s+address: (.+?)\s/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         iface[cint][:addresses][$1] = { "family" => "lladdr" }
       end
       if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         # convert the netmask to decimal for consistency
         netmask = "#{$2[2, 2].hex}.#{$2[4, 2].hex}.#{$2[6, 2].hex}.#{$2[8, 2].hex}"
         if $3.empty?
@@ -67,7 +67,7 @@ Ohai.plugin(:Network) do
         end
       end
       if line =~ /\s+inet6 ([a-f0-9\:]+)%?(\w*)\s+prefixlen\s+(\d+)\s*\w*\s*([\da-fx]*)/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         if $4.empty?
           iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $3 }
         else
@@ -89,7 +89,7 @@ Ohai.plugin(:Network) do
     so.stdout.lines do |line|
       if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
         next unless iface[$3] # this should never happen
-        iface[$3][:arp] = Mash.new unless iface[$3][:arp]
+        iface[$3][:arp] ||= Mash.new
         iface[$3][:arp][$1] = $2.downcase
       end
     end
@@ -107,9 +107,9 @@ Ohai.plugin(:Network) do
       # em0     1500  <Link>      00:11:25:2d:90:be  3719557     0  3369969     0     0    0
       # $1                        $2                      $3    $4    $5       $6    $7   $8
       if line =~ /^([\w\.\*]+)\s+\d+\s+<Link>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
-        net_counters[$1] = Mash.new unless net_counters[$1]
-        net_counters[$1]["rx"] = Mash.new unless net_counters[$1]["rx"]
-        net_counters[$1]["tx"] = Mash.new unless net_counters[$1]["tx"]
+        net_counters[$1] ||= Mash.new
+        net_counters[$1]["rx"] ||= Mash.new
+        net_counters[$1]["tx"] ||= Mash.new
         net_counters[$1]["rx"]["packets"] = $3
         net_counters[$1]["rx"]["errors"] = $4
         net_counters[$1]["tx"]["packets"] = $5