diff options
| -rw-r--r-- | lib/mauve/configuration_builders/server.rb | 19 | ||||
| -rw-r--r-- | lib/mauve/processor.rb | 89 | ||||
| -rw-r--r-- | lib/mauve/server.rb | 4 | ||||
| -rw-r--r-- | lib/mauve/timer.rb | 100 | ||||
| -rw-r--r-- | lib/object_builder.rb | 2 |
5 files changed, 76 insertions, 138 deletions
diff --git a/lib/mauve/configuration_builders/server.rb b/lib/mauve/configuration_builders/server.rb index c000144..e3654b9 100644 --- a/lib/mauve/configuration_builders/server.rb +++ b/lib/mauve/configuration_builders/server.rb @@ -64,24 +64,6 @@ module Mauve end end - # - # This is the Timer singleton. - # - class Timer < ObjectBuilder - # - # This is the interval at which the Timer thread is run. This will limit - # the rate at which notifications can be sent, if set. - # - is_attribute "poll_every" - - # Sets up a Mauve::Timer singleton as the result - # - # @return [Mauve::Timer] - def builder_setup - @result = Mauve::Timer.instance - end - end - class Notifier < ObjectBuilder # # This is the interval at which the notification queue is polled for new @@ -163,7 +145,6 @@ module Mauve is_builder "web_interface", HTTPServer is_builder "listener", UDPServer is_builder "processor", Processor - is_builder "timer", Timer is_builder "notifier", Notifier is_builder "heartbeat", Heartbeat is_builder "pop3_server", Pop3Server diff --git a/lib/mauve/processor.rb b/lib/mauve/processor.rb index c8a1dfb..96c44aa 100644 --- a/lib/mauve/processor.rb +++ b/lib/mauve/processor.rb @@ -76,25 +76,87 @@ module Mauve # # flush the queue # - main_loop + do_processor end private - # This is the main loop that does the processing. - # def main_loop - - sz = Server.packet_buffer_size + do_processor + do_timer unless timer_should_stop? + end - sz.times do - Timer.instance.freeze if Timer.instance.alive? and !Timer.instance.frozen? + def do_timer + # + # Get the next alert. + # + next_alert = Alert.find_next_with_event + + # + # If we didn't find an alert, or the alert we found is due in the future, + # look for the next alert_changed object. + # + if next_alert.nil? or next_alert.due_at > Time.now + next_alert_changed = AlertChanged.find_next_with_event + end + if next_alert_changed.nil? and next_alert.nil? + next_to_notify = nil + + elsif next_alert.nil? or next_alert_changed.nil? + next_to_notify = (next_alert || next_alert_changed) + + else + next_to_notify = ( next_alert.due_at < next_alert_changed.due_at ? next_alert : next_alert_changed ) + + end + + # + # Nothing to notify? + # + if next_to_notify.nil? + # + # Sleep indefinitely + # + logger.info("Nothing to notify about -- snoozing for a while.") + sleep_loops = 600 + else # - # Hmm.. timer not frozen. + # La la la nothing to do. # - break unless Timer.instance.frozen? + logger.info("Next to notify: #{next_to_notify} #{next_to_notify.is_a?(AlertChanged) ? "(reminder)" : "(heartbeat)"} -- snoozing until #{next_to_notify.due_at.iso8601}") + sleep_loops = ((next_to_notify.due_at - Time.now).to_f / 0.1).round.to_i + end + + sleep_loops = 0 if sleep_loops.nil? or sleep_loops < 1 + # + # Ah-ha! Sleep with a break clause. + # + sleep_loops.times do + # + # Start again if the situation has changed. + # + break if timer_should_stop? + + # + # This is a rate-limiting step for alerts. + # + Kernel.sleep 0.1 + end + + return if timer_should_stop? or next_to_notify.nil? + + next_to_notify.poll + end + + # This is processor loop + # + def do_processor + + sz = Server.packet_buffer_size + + sz.times do data, client, received_at = Server.packet_pop # @@ -136,14 +198,11 @@ module Mauve ensure @transmission_id_cache[update.transmission_id.to_s] = Time.now end - end + end - ensure - # - # Thaw the timer - # - Timer.instance.thaw if Timer.instance.frozen? + def timer_should_stop? + (Server.packet_buffer_size > 0) end end diff --git a/lib/mauve/server.rb b/lib/mauve/server.rb index f07b7ad..3e82858 100644 --- a/lib/mauve/server.rb +++ b/lib/mauve/server.rb @@ -7,7 +7,7 @@ require 'mauve/alert' require 'mauve/history' require 'mauve/mauve_thread' require 'mauve/mauve_time' -require 'mauve/timer' +require 'mauve/notifier' require 'mauve/udp_server' require 'mauve/pop3_server' require 'mauve/processor' @@ -23,7 +23,7 @@ module Mauve # # This is the order in which the threads should be started. # - THREAD_CLASSES = [UDPServer, HTTPServer, Pop3Server, Processor, Timer, Notifier, Heartbeat] + THREAD_CLASSES = [UDPServer, HTTPServer, Pop3Server, Processor, Notifier, Heartbeat] attr_reader :hostname, :database, :initial_sleep attr_reader :packet_buffer, :notification_buffer, :started_at diff --git a/lib/mauve/timer.rb b/lib/mauve/timer.rb deleted file mode 100644 index 5a43b60..0000000 --- a/lib/mauve/timer.rb +++ /dev/null @@ -1,100 +0,0 @@ -# encoding: UTF-8 -require 'mauve/alert' -require 'mauve/notifier' -require 'mauve/mauve_thread' -require 'thread' -require 'log4r' - -module Mauve - - # - # This is the thread that looks for reminders and heartbeat alerts to poll. - # - class Timer < MauveThread - - include Singleton - - def initialize - # - # Set the default polling interval to zero.. - # - self.poll_every = 0 - - super - end - - private - - # This is the trigger for heartbeats and reminders. - # - # It looks up the next event, and sleeps until it is due. If an update - # comes in (via the processor) it is broken out of its sleep, and starts - # again when woken up. - # - def main_loop - # - # Get the next alert. - # - next_alert = Alert.find_next_with_event - - # - # If we didn't find an alert, or the alert we found is due in the future, - # look for the next alert_changed object. - # - if next_alert.nil? or next_alert.due_at > Time.now - next_alert_changed = AlertChanged.find_next_with_event - end - - if next_alert_changed.nil? and next_alert.nil? - next_to_notify = nil - - elsif next_alert.nil? or next_alert_changed.nil? - next_to_notify = (next_alert || next_alert_changed) - - else - next_to_notify = ( next_alert.due_at < next_alert_changed.due_at ? next_alert : next_alert_changed ) - - end - - # - # Nothing to notify? - # - if next_to_notify.nil? - # - # Sleep indefinitely - # - logger.info("Nothing to notify about -- snoozing for a while.") - sleep_loops = 600 - else - # - # La la la nothing to do. - # - logger.info("Next to notify: #{next_to_notify} #{next_to_notify.is_a?(AlertChanged) ? "(reminder)" : "(heartbeat)"} -- snoozing until #{next_to_notify.due_at.iso8601}") - sleep_loops = ((next_to_notify.due_at - Time.now).to_f / 0.1).round.to_i - end - - sleep_loops = 1 if sleep_loops.nil? or sleep_loops < 1 - - # - # Ah-ha! Sleep with a break clause. - # - sleep_loops.times do - # - # Start again if the situation has changed. - # - break if self.should_stop? - - # - # This is a rate-limiting step for alerts. - # - Kernel.sleep 0.1 - end - - return if self.should_stop? or next_to_notify.nil? - - next_to_notify.poll - end - - end - -end diff --git a/lib/object_builder.rb b/lib/object_builder.rb index 26dd1a5..ebd655b 100644 --- a/lib/object_builder.rb +++ b/lib/object_builder.rb @@ -174,8 +174,6 @@ class ObjectBuilder end def include(file_or_directory) - - if File.file?(file_or_directory) include_file(file_or_directory) else |