heartbeat.rb in reptile-0.1.0

- old
+ new
@@ -1,82 +1,75 @@
 require 'active_record'
 
 module Reptile
-  # MySQL DTD for setting up Heartbeats.  Change HEARTBEAT_USER, HEARTBEAT_PASS, and MONITORING_BOX 
-  # to ip of the monitoring server. 
+  # MySQL DTD for setting up Heartbeats.  Change HEARTBEAT_USER, HEARTBEAT_PASS, and MONITORING_BOX
+  # to ip of the monitoring server.
   #
-  # GRANT SELECT, INSERT, UPDATE, ALTER ON replication_monitor.* 
+  # GRANT SELECT, INSERT, UPDATE, ALTER ON replication_monitor.*
   # TO 'HEARTBEAT_USER'@"localhost" IDENTIFIED BY 'HEARTBEAT_PASS';  GRANT SELECT, INSERT, UPDATE,
   # ALTER ON replication_monitor.* TO 'HEARTBEAT_USER'@"MONITORING_BOX" IDENTIFIED BY 'HEARTBEAT_PASS';
-  # 
+  #
   # CREATE DATABASE replication_monitor;
-  # 
+  #
   # CREATE TABLE replication_monitor.heartbeats (
-  #   unix_time INTEGER NOT NULL, 
-  #   db_time TIMESTAMP NOT NULL, 
+  #   unix_time INTEGER NOT NULL,
+  #   db_time TIMESTAMP NOT NULL,
   #   INDEX time_idx(unix_time)
   # )
   #
   class Heartbeat < ActiveRecord::Base
 
     # Set the default connection settings for writing/reading heartbeats.
     # These will be merged with the per-database settings passed to <code>connect</code>.
     def self.user=(default_configs)
       @user = default_configs
     end
-  
+
     # The default connection settings which override per-database settings.
     def self.user
       @user ||= {}
     end
-    
+
     def self.connect(configs)
       Databases.connect(configs.merge(user).merge("database" => 'replication_monitor'))
     end
-  
+
     # Write a heartbeat.
     # Thump thump.
     def self.write(name, configs)
       self.connect(configs)
       heartbeat = Heartbeat.create(:unix_time => Time.now.to_i, :db_time => "NOW()")
-      get_logger.info "Wrote heartbeat to #{name} at #{Time.at(heartbeat.unix_time)}"
+      Log.debug "Wrote heartbeat to #{name} at #{Time.at(heartbeat.unix_time)}"
     end
 
     # Read the most recent heartbeat and return the delay in seconds, or nil if no heartbeat are found.
     def self.read(name, configs)
       self.connect(configs)
-    
+
       current_time = Time.now
 
       delay = nil
       heartbeat = Heartbeat.find(:first, :order => 'db_time DESC')
-    
+
        # No heartbeats at all!
       if heartbeat.nil?
-        get_logger.info "No heartbeats found on #{name} at #{Time.now}"
+        Log.info "No heartbeats found on #{name} at #{Time.now}"
         return nil;
       end
-   
+
       # Not sure why we have both, (one is easier to read?).
       # Use one or the other to calculate delay...
       delay = (Time.now - Time.at(heartbeat.unix_time)).round
       #delay = (Time.now - heartbeat.db_time)
 
-      get_logger.info "Read heartbeat from #{name} at #{Time.at(heartbeat.unix_time)}. The delay is #{strfdelay(delay)}"
-    
+      Log.debug "Read heartbeat from #{name} at #{Time.at(heartbeat.unix_time)}."
+      Log.info "The delay is #{strfdelay(delay)}"
+
       delay
     end
-   
-    def self.logger=(new_logger)
-      @logger = new_logger  
-    end
-    
-    def self.get_logger
-      @logger ||= Logger.new(STDOUT)
-    end
-    
+
 private
- 
+
     # Format the delay (in seconds) as a human-readable string.
     def self.strfdelay(delay)
       seconds = delay % 60
       minutes = delay / 60 % 60
       hours = delay / 60 / 60
\ No newline at end of file