diff --git a/lib/ixtlan/audit/audit_rack.rb b/lib/ixtlan/audit/audit_rack.rb index 2039bb3..bb05ae8 100644 --- a/lib/ixtlan/audit/audit_rack.rb +++ b/lib/ixtlan/audit/audit_rack.rb @@ -5,9 +5,6 @@ class AuditRack def initialize(app, audit_manager) @app = app @audit_manager = audit_manager - self.class_eval do - include Rails.application.routes.url_helpers - end end def call(env) diff --git a/lib/ixtlan/audit/manager.rb b/lib/ixtlan/audit/manager.rb index 82338ee..94d679e 100644 --- a/lib/ixtlan/audit/manager.rb +++ b/lib/ixtlan/audit/manager.rb @@ -32,8 +32,9 @@ def model=(m) end def keep_logs=(days) + old = @keep_logs @keep_logs = days.to_i - daily_cleanup + daily_cleanup if old != @keep_logs end def push(message, username) @@ -62,7 +63,7 @@ def username_method def daily_cleanup if model if(@last_cleanup.nil? || @last_cleanup < 1.days.ago) - @last_cleanup = Date.today + @last_cleanup = 0.days.ago # to have the right type begin delete_all logger.info("cleaned audit logs") diff --git a/lib/ixtlan/audit/railtie.rb b/lib/ixtlan/audit/railtie.rb index 8a5a932..9b0fa2a 100644 --- a/lib/ixtlan/audit/railtie.rb +++ b/lib/ixtlan/audit/railtie.rb @@ -11,7 +11,7 @@ class Railtie < ::Rails::Railtie app.config.audit_manager = Manager.new ::ActionController::Base.send(:include, Module) ::ActionController::Base.send(:after_filter, :audit) - app.config.middleware.use AuditRack, app.config.audit_manager + app.config.middleware.use(AuditRack, app.config.audit_manager) end end diff --git a/lib/ixtlan/audit/user_logger.rb b/lib/ixtlan/audit/user_logger.rb index 2567b76..809c4fd 100644 --- a/lib/ixtlan/audit/user_logger.rb +++ b/lib/ixtlan/audit/user_logger.rb @@ -29,7 +29,7 @@ def log_action(controller, message = nil) if controller.params[:controller] audits = controller.instance_variable_get("@#{controller.params[:controller]}") if(audits) - "#{controller.params[:controller]}##{controller.params[:action]} #{controller.params[:action].classify}[#{audits.size}]#{as_xml}#{message}" + "#{controller.params[:controller]}##{controller.params[:action]} #{controller.params[:controller].classify}[#{audits.size}]#{as_xml}#{message}" else audit = controller.instance_variable_get("@#{controller.params[:controller].singularize}") if(audit)