.env.example

@@ -146,10 +146,9 @@ 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
              

                +# Specify the frequency with which the scheduler checks for event expiration.
              

                +# You can use `m` for minutes, `h` for hours, and `d` for days.
              

                +EVENT_EXPIRATION_CHECK="3h"
              

                 
              

                 # Use Graphviz for generating diagrams instead of using Google Chart
              

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

app/models/agent.rb

@@ -22,9 +22,6 @@ 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.insert(1, ["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
              

                 
              

lib/huginn_scheduler.rb

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

                     end
              

                 
              

                     # Schedule event cleanup.
              

                -    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
              

                +    @rufus_scheduler.every ENV['EVENT_EXPIRATION_CHECK'] do
              

                +      cleanup_expired_events!
              

                     end
              

                 
              

                     # Schedule failed job cleanup.