From e140af144e987ff7f6d767f2dc48b9cf685803fd Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Wed, 13 Jul 2011 16:02:50 +0100 Subject: Big commit * Added manpages for all binaries * Added log-reopening for mauvealert-server, and logrotate snippet * mauveserver now adds a user on install, and runs as that user * Big logging tidy-up * Alert subjects are only overwritten by the source, when the subject in the databse is empty * Removed various attr_writer methods that were being redifined * Added a notes box to the acknowledge form, but this doesn't work yet --- lib/mauve/notification.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib/mauve/notification.rb') diff --git a/lib/mauve/notification.rb b/lib/mauve/notification.rb index 2f77a13..ed96f7e 100644 --- a/lib/mauve/notification.rb +++ b/lib/mauve/notification.rb @@ -44,10 +44,7 @@ module Mauve plus_one_week = MauveTime.now + 604800 # ish while offset < plus_one_week offset += interval - if DuringRunner.new(offset, @alert, &@during).now? - @logger.debug("Found reminder time of #{offset}") - return offset - end + return offset if DuringRunner.new(offset, @alert, &@during).now? end @logger.info("Could not find a reminder time less than a week "+ "for #{@alert}.") -- cgit v1.2.1