.env.example

@@ -146,6 +146,11 @@ ENABLE_SECOND_PRECISION_SCHEDULE=false

                 # at the expense of time accuracy.
              

                 #SCHEDULER_FREQUENCY=0.3
              

                 
              

                +# Specify whether events ages should be checked daily or frequently.
              

                +# A value of "normal" checks each day at midnight, while a value of
              

                +# "frequent" adds an option to keep events for 90 seconds and checks every 3 minutes
              

                +SCHEDULER_EXPIRATION_CHECK=normal
              

                +
              

                 # Use Graphviz for generating diagrams instead of using Google Chart
              

                 # Tools.  Specify a dot(1) command path built with SVG support
              

                 # enabled.
              

app/models/agent.rb

@@ -22,6 +22,9 @@ class Agent < ActiveRecord::Base

                                  midnight 1am 2am 3am 4am 5am 6am 7am 8am 9am 10am 11am noon 1pm 2pm 3pm 4pm 5pm 6pm 7pm 8pm 9pm 10pm 11pm never]
              

                 
              

                   EVENT_RETENTION_SCHEDULES = [["Forever", 0], ["1 day", 1], *([2, 3, 4, 5, 7, 14, 21, 30, 45, 90, 180, 365].map {|n| ["#{n} days", n] })]
              

                +  if ENV['SCHEDULER_EXPIRATION_CHECK'] == 'frequent'
              

                +    EVENT_RETENTION_SCHEDULES.push(["A minute", 60])
              

                +  end
              

                 
              

                   attr_accessible :options, :memory, :name, :type, :schedule, :controller_ids, :control_target_ids, :disabled, :source_ids, :scenario_ids, :keep_events_for, :propagate_immediately, :drop_pending_events
              

                 
              
@@ -129,12 +132,18 @@ class Agent < ActiveRecord::Base

                   end
              

                 
              

                   def new_event_expiration_date
              

                -    keep_events_for > 0 ? keep_events_for.days.from_now : nil
              

                +    if keep_events_for == 60
              

                +      90.seconds.from_now
              

                +    else
              

                +      keep_events_for > 0 ? keep_events_for.days.from_now : nil
              

                +    end
              

                   end
              

                 
              

                   def update_event_expirations!
              

                     if keep_events_for == 0
              

                       events.update_all :expires_at => nil
              

                +    elsif keep_events_for == 60
              

                +      events.update_all "expires_at = " + rdbms_date_add("created_at", "SECOND", 90)
              

                     else
              

                       events.update_all "expires_at = " + rdbms_date_add("created_at", "DAY", keep_events_for.to_i)
              

                     end
              

lib/huginn_scheduler.rb

@@ -114,8 +114,14 @@ class HuginnScheduler

                     end
              

                 
              

                     # Schedule event cleanup.
              

                -    @rufus_scheduler.cron "0 0 * * * " + tzinfo_friendly_timezone do
              

                -      cleanup_expired_events!
              

                +    if ENV['SCHEDULER_EXPIRATION_CHECK'] == 'normal'
              

                +      @rufus_scheduler.cron "0 0 * * * " + tzinfo_friendly_timezone do
              

                +        cleanup_expired_events!
              

                +      end
              

                +    elsif ENV['SCHEDULER_EXPIRATION_CHECK'] == 'frequent'
              

                +      @rufus_scheduler.every '3m' do
              

                +        cleanup_expired_events!
              

                +      end
              

                     end
              

                 
              

                     # Schedule failed job cleanup.