[Logilogi-svn] SF.net SVN: logilogi:[1617] trunk

Revision: 1617
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1617&view=rev
Author:   wybow
Date:     2009-10-19 20:48:58 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Fixed daemons & made alerts daily

Modified Paths:
--------------
    trunk/app/models/log_log_subscription.rb
    trunk/lib/daemons/logilogi.rb
    trunk/lib/daemons/logilogi_ctl
    trunk/lib/tasks/daemons.rake

Modified: trunk/app/models/log_log_subscription.rb
===================================================================
--- trunk/app/models/log_log_subscription.rb	2009-10-19 20:13:22 UTC (rev 1616)
+++ trunk/app/models/log_log_subscription.rb	2009-10-19 20:48:58 UTC (rev 1617)
@@ -18,14 +18,15 @@
 #    self.element_name = "message"
 #  end
   
-  def self.send_out_weekly_alerts
+  def self.send_out_alerts(period)
     User.find_each do |user|
-      url = URI.parse(GlobalConfig.log_log_site + "/channels/for_" + user.unix_name + "/periods/weekly.txt")
+      url = URI.parse(GlobalConfig.log_log_site + 
+          "/channels/for_" + user.unix_name + "/periods/" + period + ".txt")
       begin
         page = Net::HTTP.get_response(url)
         periodical = page.body
         if periodical =~ /[^\s]/
-          Notifier.deliver_for_log(user, 'Weekly', periodical)
+          Notifier.deliver_for_log(user, period.camelize, periodical)
         end
       rescue
       end

Modified: trunk/lib/daemons/logilogi.rb
===================================================================
--- trunk/lib/daemons/logilogi.rb	2009-10-19 20:13:22 UTC (rev 1616)
+++ trunk/lib/daemons/logilogi.rb	2009-10-19 20:48:58 UTC (rev 1617)
@@ -34,11 +34,11 @@
           " nice -n 17 rake daemons:run:daily RAILS_ENV=" + RAILS_ENV
       $done_daily = true
     end
-    if Time.now.wday == 0 and done_weekly == false
-      trapped_system "cd #{File.dirname(__FILE__)}/../..;" + 
-          " nice -n 17 rake daemons:run:weekly RAILS_ENV=" + RAILS_ENV
-      $done_weekly = true
-    end
+#    if Time.now.wday == 0 and done_weekly == false
+#      trapped_system "cd #{File.dirname(__FILE__)}/../..;" + 
+#          " nice -n 17 rake daemons:run:weekly RAILS_ENV=" + RAILS_ENV
+#      $done_weekly = true
+#    end
   else
     $done_daily = false
     $done_weekly = false

Modified: trunk/lib/daemons/logilogi_ctl
===================================================================
--- trunk/lib/daemons/logilogi_ctl	2009-10-19 20:13:22 UTC (rev 1616)
+++ trunk/lib/daemons/logilogi_ctl	2009-10-19 20:48:58 UTC (rev 1617)
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'active_support'
 require "daemons"
 require 'yaml'
 require 'erb'
-#require File.dirname(__FILE__) + "/../../config/initializers/daemons.rb"
+require 'active_support'
 
 options = YAML.load(
   ERB.new(

Modified: trunk/lib/tasks/daemons.rake
===================================================================
--- trunk/lib/tasks/daemons.rake	2009-10-19 20:13:22 UTC (rev 1616)
+++ trunk/lib/tasks/daemons.rake	2009-10-19 20:48:58 UTC (rev 1617)
@@ -20,9 +20,7 @@
  
   namespace :run do
     desc "Does a set of re-indexings, called by daemon"
-    task :constant do
-      require "#{File.dirname(__FILE__)}/../../config/environment.rb"
-
+    task :constant => :environment do
       ActiveRecord::Base.logger.add(Logger::INFO, "Constantly running at #{Time.now}.\n")
       500.times do
         exit if !$drunning
@@ -36,9 +34,7 @@
     end
 
     desc "Daily run, devaluates weights, called by daemon"
-    task :daily do
-      require "#{File.dirname(__FILE__)}/../../config/environment.rb"
-       
+    task :daily => :environment do
       ActiveRecord::Base.logger.add(Logger::INFO, "Daily started at #{Time.now}.\n")
  
       Rating.devaluate_weights(GlobalConfig.daily_fraction)
@@ -46,13 +42,15 @@
       PeerGroupMembership.recalculate_percentiles
       PeerGroupMembership.drop_the_powerless
 
+      if GlobalConfig.use_log_log
+        LogLogSubscription.send_out_daily_alerts
+      end
+
       ActiveRecord::Base.logger.add(Logger::INFO, "Daily finished at #{Time.now}.\n")
     end
 
     desc "Weekly run, sends out alerts, called by daemon"
-    task :weekly do
-      require "#{File.dirname(__FILE__)}/../../config/environment.rb"
-       
+    task :weekly => :environment do
       ActiveRecord::Base.logger.add(Logger::INFO, "Weekly started at #{Time.now}.\n")
  
       if GlobalConfig.use_log_log


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.