From 91fb2856202a487c7853af71ce30569d7c08b30c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 24 Apr 2019 21:12:04 +0100 Subject: [PATCH] Fix new rubocop warnings --- cookbooks/letsencrypt/files/default/bin/check-certificate | 6 +++--- .../files/default/replication-bin/replicate-changesets | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cookbooks/letsencrypt/files/default/bin/check-certificate b/cookbooks/letsencrypt/files/default/bin/check-certificate index f3599a36f..73bd8a658 100755 --- a/cookbooks/letsencrypt/files/default/bin/check-certificate +++ b/cookbooks/letsencrypt/files/default/bin/check-certificate @@ -17,8 +17,8 @@ begin ssl.sync_close = true ssl.hostname = domains.first ssl.connect -rescue StandardError => error - puts "Error connecting to #{host}: #{error.message}" +rescue StandardError => e + puts "Error connecting to #{host}: #{e.message}" end if ssl @@ -30,7 +30,7 @@ if ssl puts "Certificate #{domains.first} on #{host} expires at #{certificate.not_after}" end - subject_alt_name = certificate.extensions.find { |e| e.oid == "subjectAltName" } + subject_alt_name = certificate.extensions.find { |ext| ext.oid == "subjectAltName" } if subject_alt_name.nil? puts "Certificate #{domains.first} on #{host} has no subjectAltName" diff --git a/cookbooks/planet/files/default/replication-bin/replicate-changesets b/cookbooks/planet/files/default/replication-bin/replicate-changesets index 363d6040a..29131b2ed 100755 --- a/cookbooks/planet/files/default/replication-bin/replicate-changesets +++ b/cookbooks/planet/files/default/replication-bin/replicate-changesets @@ -278,7 +278,7 @@ class Replicator fl.flock(File::LOCK_UN) rescue StandardError - STDERR.puts("Error! Couldn't update state.") + warn "Error! Couldn't update state." fl.flock(File::LOCK_UN) raise end @@ -290,6 +290,6 @@ begin rep = Replicator.new(ARGV[0]) rep.save! rescue StandardError => e - STDERR.puts "ERROR: #{e.message}" + warn "ERROR: #{e.message}" exit 1 end -- 2.43.2