diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2020-09-17 16:12:32 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2020-09-17 16:12:32 -0700 |
| commit | 1a06ff657f46950b86abf9287205ce8b19763ace (patch) | |
| tree | fdb4fbe9fd834fc935f857e4957d9ac353946046 | |
| parent | 0487d320efda47bce88b68c0916e2f4b275244ae (diff) | |
| download | ohai-1a06ff657f46950b86abf9287205ce8b19763ace.tar.gz | |
chefstyle fixes
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | lib/ohai/mixin/ec2_metadata.rb | 4 | ||||
| -rw-r--r-- | lib/ohai/plugins/linux/ipc.rb | 2 | ||||
| -rw-r--r-- | lib/ohai/plugins/linux/network.rb | 2 | ||||
| -rw-r--r-- | lib/ohai/plugins/rackspace.rb | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/ohai/mixin/ec2_metadata.rb b/lib/ohai/mixin/ec2_metadata.rb index d3412b19..f24472d2 100644 --- a/lib/ohai/mixin/ec2_metadata.rb +++ b/lib/ohai/mixin/ec2_metadata.rb @@ -142,7 +142,7 @@ module Ohai key = expand_path(o) if key[-1..-1] != "/" retr_meta = metadata_get("#{id}#{key}", api_version) - metadata[metadata_key(key)] = retr_meta ? retr_meta : "" + metadata[metadata_key(key)] = retr_meta || "" elsif not key.eql?("/") metadata[key[0..-2]] = fetch_dir_metadata("#{id}#{key}", api_version) end @@ -159,7 +159,7 @@ module Ohai key = expand_path(o) if key[-1..-1] != "/" retr_meta = metadata_get("#{id}#{key}", api_version) - data = retr_meta ? retr_meta : "" + data = retr_meta || "" json = String(data) parser = FFI_Yajl::Parser.new metadata[metadata_key(key)] = parser.parse(json) diff --git a/lib/ohai/plugins/linux/ipc.rb b/lib/ohai/plugins/linux/ipc.rb index 6a063192..552ddc8f 100644 --- a/lib/ohai/plugins/linux/ipc.rb +++ b/lib/ohai/plugins/linux/ipc.rb @@ -41,7 +41,7 @@ Ohai.plugin(:IPC) do "perms" => parts[3], "bytes" => parts[4].to_i, "nattch" => parts[5].to_i, - "status" => parts[6] ? parts[6] : "", + "status" => parts[6] || "", } ipc["shm"][parts[1].to_i] = segment diff --git a/lib/ohai/plugins/linux/network.rb b/lib/ohai/plugins/linux/network.rb index f5008be0..80796d0c 100644 --- a/lib/ohai/plugins/linux/network.rb +++ b/lib/ohai/plugins/linux/network.rb @@ -646,7 +646,7 @@ Ohai.plugin(:Network) do logger.trace("Plugin Network: #{default_prefix}_interface set to #{default_route[:dev]}") # setting gateway to 0.0.0.0 or :: if the default route is a link level one - network["#{default_prefix}_gateway"] = default_route[:via] ? default_route[:via] : family[:default_route].chomp("/0") + network["#{default_prefix}_gateway"] = default_route[:via] || family[:default_route].chomp("/0") logger.trace("Plugin Network: #{default_prefix}_gateway set to #{network["#{default_prefix}_gateway"]}") # deduce the default route the user most likely cares about to pick {ip,mac,ip6}address below diff --git a/lib/ohai/plugins/rackspace.rb b/lib/ohai/plugins/rackspace.rb index c831d1b5..5576ba60 100644 --- a/lib/ohai/plugins/rackspace.rb +++ b/lib/ohai/plugins/rackspace.rb @@ -161,8 +161,8 @@ Ohai.plugin(:Rackspace) do unless rackspace[:public_ip].nil? rackspace[:public_hostname] = begin Resolv.getname(rackspace[:public_ip]) - rescue Resolv::ResolvError, Resolv::ResolvTimeout - rackspace[:public_ip] + rescue Resolv::ResolvError, Resolv::ResolvTimeout + rackspace[:public_ip] end end rackspace[:local_ipv4] = rackspace[:private_ip] |