notifyme 0.2 → 0.3

data/README.rdoc

@@ -10,11 +10,11 @@ gem install notifyme
 
 # run in the background
 
-$ notifyme_daemon start --(double dash here) /path/to/notifyme_config.rb
+$ notifyme_daemon start --(double dash here) /absolute/path/to/notifyme_config.rb
 
 # debug (use Ctrl + C to stop it)
 
-$ notifyme_daemon run --(double dash here) /path/to/notifyme_config.rb
+$ notifyme_daemon run --(double dash here) /absolute/path/to/notifyme_config.rb
 
 # stop
 
@@ -30,7 +30,7 @@ The output from every task's command will be processed (send to endpoint) only i
 
 == Version
 
-v 0.2
+v 0.3
 
 == Author
 

data/lib/notifyme/start.rb

@@ -1,9 +1,9 @@
-module NotifyMe
+require 'notifyme/task'
+require 'notifyme/log'
 
-  VERSION = '0.1'
+module NotifyMe
 
-  autoload :Task, 'notifyme/task'
-  autoload :Log, 'notifyme/log'
+  VERSION = '0.3'
 
   class Start
     class << self
@@ -11,6 +11,7 @@ module NotifyMe
       # log 
       @@log_args = nil
       @@log_format = nil
+      @@log_directory = nil
 
       # tasks list
       @@tasks = []
@@ -28,7 +29,7 @@ module NotifyMe
 
       def task(name)
         raise 'Invalid task calls' unless block_given?
-        task = Task.new
+        task = NotifyMe::Task.new
         task.name = name
         task.logger ||= NotifyMe::Log::Base.new(@@log_args).logger
         task.log_format ||= @@log_format
@@ -43,6 +44,11 @@ module NotifyMe
       def log_format(format)
         @@log_format = format
       end
+
+      def log_directory(directory)
+        FileUtils.mkdir_p directory unless File.directory? directory
+        @@log_directory = directory
+      end
     end
 
     def run
@@ -69,6 +75,7 @@ module NotifyMe
         task.result = task.command.call
         task.end_run_time = Time.now.to_i
       rescue Exception => e
+        log_error task.name, task.command, e.to_s
         task.result = e.to_s
       end
 
@@ -76,7 +83,11 @@ module NotifyMe
       return if task.result.to_s.empty?
 
       # restart the command if need
-      task.restart_command.call if task.restart_command
+      begin
+        task.restart_command.call if task.restart_command
+      rescue Exception => e
+        log_error task.name, task.restart_command, e.to_s
+      end
 
       @mutex.synchronize do 
         begin
@@ -87,6 +98,14 @@ module NotifyMe
       end
     end
 
+    def log_error(task_name, command, msg)
+      return if @@log_directory.nil?
+      log_file = File.join(@@log_directory, '/', "#{task_name}.log")
+      File.open(log_file, 'a') do |f|
+        f.write "(#{Time.new.to_s}) #{command} : #{msg}\n"
+      end
+    end
+
     def initialize(config_file)
       require config_file
     end

data/lib/notifyme.rb

@@ -1,3 +1,4 @@
 require 'rubygems'
 require 'thread'
+require 'fileutils'
 require 'notifyme/start'

data/notifyme_config.rb

@@ -29,16 +29,18 @@ NotifyMe::Start.config do
   # :csv, :text, :xml, :json
   log_format :json 
 
+  # log_directory '/tmp/notifyme'
+
   # add some tasks
 
   task :checking_disk do |t|
-    t.sleep_time = 1
+    t.sleep_time = 3
     t.command = Proc.new { %x{df -h} }
   end
 
-  task :checking_http do |t|
+  task :checking_date do |t|
     t.sleep_time = 2
     t.command = MyTask
-    t.restart_command = lambda { puts "restarted !" }
+    t.restart_command = Proc.new { %x{dates} }
   end
 end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - xianhua.zhou
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-06 00:00:00 +08:00
+date: 2010-11-17 00:00:00 +08:00
 default_executable: notifyme_daemon
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,13 +56,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/notifyme/task.rb
-- lib/notifyme/start.rb
+- lib/vendor/smtp_add_tls_support.rb
+- lib/notifyme/log/stdout.rb
 - lib/notifyme/log/mail.rb
 - lib/notifyme/log/file.rb
-- lib/notifyme/log/stdout.rb
+- lib/notifyme/task.rb
+- lib/notifyme/start.rb
 - lib/notifyme/log.rb
-- lib/vendor/smtp_add_tls_support.rb
 - lib/notifyme.rb
 - README.rdoc
 - CHANGELOG