瀏覽代碼

remove duplicate method

Andrew Cantino 11 年之前
父節點
當前提交
c4c1a53942
共有 2 個文件被更改,包括 15 次插入19 次删除
  1. 14 18
      app/models/agent.rb
  2. 1 1
      spec/models/agent_spec.rb

+ 14 - 18
app/models/agent.rb

@@ -103,6 +103,14 @@ class Agent < ActiveRecord::Base
     keep_events_for > 0 ? keep_events_for.days.from_now : nil
   end
 
+  def update_event_expirations!
+    if keep_events_for == 0
+      events.update_all :expires_at => nil
+    else
+      events.update_all "expires_at = DATE_ADD(`created_at`, INTERVAL #{keep_events_for.to_i} DAY)"
+    end
+  end
+
   def make_message(payload, message = options[:message])
     message.gsub(/<([^>]+)>/) { Utils.value_at(payload, $1) || "??" }
   end
@@ -151,6 +159,11 @@ class Agent < ActiveRecord::Base
     log(message, options.merge(:level => 4))
   end
 
+  def delete_logs!
+    logs.delete_all
+    update_column :last_error_log_at, nil
+  end
+
   # Validations and Callbacks
 
   def sources_are_owned
@@ -181,25 +194,8 @@ class Agent < ActiveRecord::Base
     update_event_expirations! if keep_events_for_changed?
   end
 
-  def delete_logs!
-    logs.delete_all
-    update_column :last_error_log_at, nil
-  end
-
-  def log(message, options = {})
-    puts "Agent##{id}: #{message}" unless Rails.env.test?
-    AgentLog.log_for_agent(self, message, options)
-  end
-
-  def update_event_expirations!
-    if keep_events_for == 0
-      events.update_all :expires_at => nil
-    else
-      events.update_all "expires_at = DATE_ADD(`created_at`, INTERVAL #{keep_events_for.to_i} DAY)"
-    end
-  end
-
   # Class Methods
+
   class << self
     def cannot_be_scheduled!
       @cannot_be_scheduled = true

+ 1 - 1
spec/models/agent_spec.rb

@@ -458,7 +458,7 @@ describe Agent do
 
       it "sets expires_at on created events" do
         event = agents(:jane_weather_agent).create_event :payload => { 'hi' => 'there' }
-        event.expires_at.should be_within(5).of(agents(:jane_weather_agent).keep_events_for.days.from_now)
+        event.expires_at.to_i.should be_within(5).of(agents(:jane_weather_agent).keep_events_for.days.from_now.to_i)
       end
     end