diff options
author | Steve Kemp <steve@steve.org.uk> | 2012-11-16 16:07:14 +0000 |
---|---|---|
committer | Steve Kemp <steve@steve.org.uk> | 2012-11-16 16:07:14 +0000 |
commit | f30349ab117760dd33e4cd248984afc979534a19 (patch) | |
tree | c7ddeda2508ae3ab99d0f12d4aa18ed93a549fa5 /lib/custodian | |
parent | b51077ac0e9f304c538044aee2c17f2f2fda3874 (diff) |
Remove redundent text in alerts if the target was an IP
Diffstat (limited to 'lib/custodian')
-rw-r--r-- | lib/custodian/alerter.rb | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/custodian/alerter.rb b/lib/custodian/alerter.rb index da3571e..f78d299 100644 --- a/lib/custodian/alerter.rb +++ b/lib/custodian/alerter.rb @@ -83,10 +83,24 @@ class Alerter # # Test trange, and format the appropriate message. # + inside = false; if ( BYTEMARK_RANGES.any?{|range| range.include?(IPAddr.new(resolved.to_s))} ) - return "<p>#{host} resolves to #{resolved} which is inside the Bytemark network.</p>" + inside = true + end + + + if ( inside ) + if ( resolved == target ) + return "<p>#{host} is inside the Bytemark network.</p>" + else + return "<p>#{host} resolves to #{resolved} which is inside the Bytemark network.</p>" + end else - return "<p>#{host} resolves to #{resolved} which is not inside the Bytemark network.</p>" + if ( resolved == target ) + return "<p>#{host} is OUTSIDE the Bytemark network.</p>" + else + return "<p>#{host} resolves to #{resolved} which is OUTSIDE the Bytemark network.</p>" + end end end |