summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/custodian-dequeue10
-rwxr-xr-xbin/custodian-enqueue10
-rwxr-xr-xbin/custodian-queue10
-rwxr-xr-xbin/multi-ping4
-rw-r--r--lib/custodian/alerts/redis-state.rb8
-rw-r--r--lib/custodian/protocoltest/ssl.rb2
-rw-r--r--lib/custodian/queue.rb2
-rw-r--r--lib/custodian/worker.rb2
8 files changed, 24 insertions, 24 deletions
diff --git a/bin/custodian-dequeue b/bin/custodian-dequeue
index 3d0c851..d49049e 100755
--- a/bin/custodian-dequeue
+++ b/bin/custodian-dequeue
@@ -69,11 +69,11 @@ if __FILE__ == $PROGRAM_NAME then
begin
opts = GetoptLong.new(
- [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
- [ '--manual', '-m', GetoptLong::NO_ARGUMENT ],
- [ '--fail', '-f', GetoptLong::NO_ARGUMENT ],
- [ '--single', '-s', GetoptLong::NO_ARGUMENT ],
- [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ]
+ ['--help', '-h', GetoptLong::NO_ARGUMENT],
+ ['--manual', '-m', GetoptLong::NO_ARGUMENT],
+ ['--fail', '-f', GetoptLong::NO_ARGUMENT],
+ ['--single', '-s', GetoptLong::NO_ARGUMENT],
+ ['--verbose', '-v', GetoptLong::NO_ARGUMENT]
)
opts.each do |opt, arg|
case opt
diff --git a/bin/custodian-enqueue b/bin/custodian-enqueue
index 75cb863..e8f71f0 100755
--- a/bin/custodian-enqueue
+++ b/bin/custodian-enqueue
@@ -70,11 +70,11 @@ if __FILE__ == $PROGRAM_NAME then
begin
opts = GetoptLong.new(
- [ '--dump', '-d', GetoptLong::NO_ARGUMENT ],
- [ '--test', GetoptLong::NO_ARGUMENT ],
- [ '--file', '-f', GetoptLong::REQUIRED_ARGUMENT ],
- [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
- [ '--manual', '-m', GetoptLong::NO_ARGUMENT ]
+ ['--dump', '-d', GetoptLong::NO_ARGUMENT],
+ ['--test', GetoptLong::NO_ARGUMENT],
+ ['--file', '-f', GetoptLong::REQUIRED_ARGUMENT],
+ ['--help', '-h', GetoptLong::NO_ARGUMENT],
+ ['--manual', '-m', GetoptLong::NO_ARGUMENT]
)
opts.each do |opt, arg|
case opt
diff --git a/bin/custodian-queue b/bin/custodian-queue
index e793657..dcb4b9a 100755
--- a/bin/custodian-queue
+++ b/bin/custodian-queue
@@ -63,11 +63,11 @@ if __FILE__ == $PROGRAM_NAME then
begin
opts = GetoptLong.new(
- [ '--flush', '-f', GetoptLong::NO_ARGUMENT ],
- [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
- [ '--manual', '-m', GetoptLong::NO_ARGUMENT ],
- [ '--monitor', '-M', GetoptLong::OPTIONAL_ARGUMENT ],
- [ '--stats', '-s', GetoptLong::NO_ARGUMENT ]
+ ['--flush', '-f', GetoptLong::NO_ARGUMENT],
+ ['--help', '-h', GetoptLong::NO_ARGUMENT],
+ ['--manual', '-m', GetoptLong::NO_ARGUMENT],
+ ['--monitor', '-M', GetoptLong::OPTIONAL_ARGUMENT],
+ ['--stats', '-s', GetoptLong::NO_ARGUMENT]
)
opts.each do |opt, arg|
case opt
diff --git a/bin/multi-ping b/bin/multi-ping
index fd4607c..32fb4ce 100755
--- a/bin/multi-ping
+++ b/bin/multi-ping
@@ -44,8 +44,8 @@ $help = false
$manual = false
opts = GetoptLong.new(
- [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
- [ '--manual', '-m', GetoptLong::NO_ARGUMENT ])
+ ['--help', '-h', GetoptLong::NO_ARGUMENT],
+ ['--manual', '-m', GetoptLong::NO_ARGUMENT])
begin
opts.each do |opt, arg|
diff --git a/lib/custodian/alerts/redis-state.rb b/lib/custodian/alerts/redis-state.rb
index e486d9a..9c5903c 100644
--- a/lib/custodian/alerts/redis-state.rb
+++ b/lib/custodian/alerts/redis-state.rb
@@ -60,8 +60,8 @@ module Custodian
tmp['target'] = @test.target
tmp['result'] = 'RAISE'
tmp['reason'] = @test.error
- tmp['test' ] = @test.to_s
- tmp['class' ] = @test.class
+ tmp['test'] = @test.to_s
+ tmp['class'] = @test.class
@redis.lpush('recent-tests', tmp.to_json)
@redis.ltrim('recent-tests', 0, 100)
@@ -84,8 +84,8 @@ module Custodian
tmp['target'] = @test.target
tmp['result'] = 'OK'
tmp['reason'] = ''
- tmp['test' ] = @test.to_s
- tmp['class' ] = @test.class
+ tmp['test'] = @test.to_s
+ tmp['class'] = @test.class
@redis.lpush('recent-tests', tmp.to_json)
@redis.ltrim('recent-tests', 0, 100)
diff --git a/lib/custodian/protocoltest/ssl.rb b/lib/custodian/protocoltest/ssl.rb
index 4c5343e..44c3910 100644
--- a/lib/custodian/protocoltest/ssl.rb
+++ b/lib/custodian/protocoltest/ssl.rb
@@ -200,7 +200,7 @@ class SSLCheck
self.errors << verbose("Failed to fetch certificate for #{self.domain}")
return nil
else
- return ![ verify_subject, verify_valid_from, verify_valid_to, verify_signature].any?{|r| false == r}
+ return ![verify_subject, verify_valid_from, verify_valid_to, verify_signature].any?{|r| false == r}
end
end
diff --git a/lib/custodian/queue.rb b/lib/custodian/queue.rb
index 51d3a3c..740cdbf 100644
--- a/lib/custodian/queue.rb
+++ b/lib/custodian/queue.rb
@@ -145,7 +145,7 @@ end
#
def initialize
host = ENV['QUEUE_ADDRESS'] || '127.0.0.1'
- @queue = Beanstalk::Pool.new(["#{host}:11300" ])
+ @queue = Beanstalk::Pool.new(["#{host}:11300"])
end
diff --git a/lib/custodian/worker.rb b/lib/custodian/worker.rb
index 701110e..e9a7532 100644
--- a/lib/custodian/worker.rb
+++ b/lib/custodian/worker.rb
@@ -93,7 +93,7 @@ module Custodian
# Show a message on STDOUT if "--verbose" was specified.
#
def log_message(msg)
- puts msg if ENV['VERBOSE' ]
+ puts msg if ENV['VERBOSE']
end