notifyme 1.0.2 → 1.1.0

data/lib/notifyme/log.rb

@@ -25,10 +25,35 @@ module NotifyMe
     end
 
     class Logger
+      # store the time of the errors for each task
+      @@log_history = {}
+
+      # 30s, 1min, 5min, 10min, 30min, 1hour, 6hours, 12hours, 1day, 1week, 1month (unit: seconds)
+      LOG_FREQUENCE = [30, 60, 300, 600, 1800, 3600, 21600, 43200, 86400, 604800, 2592000]
+
       def initialize(parameters = {})
         @parameters = parameters
       end
 
+      def can_log?(task)
+        history = @@log_history[task.name]
+        return true if history.nil?
+
+        checkpoint = LOG_FREQUENCE[history.size - 1] || LOG_FREQUENCE.last
+        return true if Time.now.to_i - history.last > checkpoint 
+
+        false
+      end
+
+      def add_log_history(task)
+        now = Time.now.to_i
+        if @@log_history[task.name].nil?
+          @@log_history[task.name] = [now]
+        else
+          @@log_history[task.name] << now
+        end
+      end
+
       protected
       def generate(task)
         method("to_#{task.log_format}").call task

data/lib/notifyme/start.rb

@@ -1,6 +1,6 @@
 module NotifyMe
 
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
   DEFAULT_CONFIG_FILE = "#{ENV['HOME']}/.notifyme/notifyme_config.rb"
 
   autoload :Task, 'notifyme/task'
@@ -14,6 +14,9 @@ module NotifyMe
       @@log_args = [:stdout]
       @@log_format = :text
 
+      # nagios
+      @@nagios_directory = "/usr/local/nagios/libexec"
+
       # tasks list
       @@tasks = []
 
@@ -118,6 +121,20 @@ end
         end
       end
 
+      def nagios_check(name, args = '')
+        cmd = "#{@@nagios_directory}/check_#{name} #{args}"
+        begin
+          result = `#{cmd}`
+          if $?.to_i == 0
+            nil
+          else
+            "#{result.strip} (nagios check)"
+          end
+        rescue Exception => e
+          "Nagios check_#{name} failed: #{e}"
+        end
+      end
+
       def log(*args)
         @@log_args = args
       end
@@ -126,8 +143,12 @@ end
         @@log_format = format
       end
 
+      def nagios_directory(directory)
+        @@nagios_directory = directory
+      end
+
       def log_directory(directory)
-        $stderr.puts "Warn: the \"log_direcotry\" has been deprecated. You can find the error messages in the /var/log/ directory."
+        $stderr.puts "Warn: the \"log_direcotry\" has been deprecated. You can find the error messages in the /var/log/syslog file."
       end
     end
 
@@ -156,7 +177,6 @@ end
         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
 
@@ -167,20 +187,26 @@ end
       begin
         task.restart_command.call if task.restart_command
       rescue Exception => e
-        log_error task.name, task.restart_command, e.to_s
+        syslog_error task.name, task.restart_command, e.to_s
       end
 
       @mutex.synchronize do 
         begin
-          task.logger << task
-        rescue Exception =>  e
-          puts e.backtrace.join("\n")
+          if task.logger.can_log? task
+            task.logger << task
+            syslog_error task.name, task.command, task.result.to_s
+            task.logger.add_log_history task
+          end
+        rescue Exception => e
+          syslog_error task.name, "save_error_log", e.to_s + "\n" + e.backtrace.join("\n")
         end
       end
     end
 
-    def log_error(task_name, command, msg)
+    def syslog_error(task_name, command, msg)
+      Syslog.open 'notifyme', Syslog::LOG_NDELAY, Syslog::LOG_USER
       Syslog.log Syslog::LOG_ERR, "[#{Time.new.to_s}] #{task_name} # #{command} : #{msg}"
+      Syslog.close
     end
 
     def initialize(config_file)

data/notifyme_config.rb

@@ -28,6 +28,9 @@ NotifyMe::Start.config do
   # :csv, :text, :xml, :json
   log_format :text
 
+  # set nagios directory
+  # nagios_directory "/usr/local/nagios"
+
   # add some tasks
 
   #

metadata

@@ -1,109 +1,99 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: notifyme
-version: !ruby/object:Gem::Version
-  version: 1.0.2
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.1.0
 platform: ruby
-authors:
+authors: 
 - xianhua.zhou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: daemons
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.2
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json_pure
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.4.2
-- !ruby/object:Gem::Dependency
-  name: http_request.rb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.13
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: http_request.rb
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.1.13
-description: NotifyMe takes care more than one tasks and process their results for
-  you, it's similar to *NIX's cronjob.
+  type: :runtime
+  version_requirements: *id003
+description: NotifyMe takes care more than one tasks and process their results for you, it's similar to *NIX's cronjob but can do more.
 email: xianhua.zhou@gmail.com
-executables:
+executables: 
 - notifyme_daemon
 - notifyme
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/vendor/smtp_add_tls_support.rb
-- lib/notifyme/check.rb
-- lib/notifyme/log/file.rb
+
+files: 
+- lib/notifyme.rb
+- lib/notifyme/log.rb
 - lib/notifyme/log/mail.rb
 - lib/notifyme/log/stdout.rb
-- lib/notifyme/log.rb
+- lib/notifyme/log/file.rb
 - lib/notifyme/start.rb
+- lib/notifyme/check.rb
 - lib/notifyme/task.rb
-- lib/notifyme.rb
-- CHANGELOG
+- lib/vendor/smtp_add_tls_support.rb
 - INSTALL
 - notifyme_config.rb
 - bin/notifyme_daemon
 - bin/notifyme
 homepage: http://github.com/xianhuazhou/NotifyMe
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: notifyme
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: It's a kind of cronjob.
 test_files: []
+

data/CHANGELOG

@@ -1,5 +0,0 @@
-v0.2
-  auto restart the service by the restart_command if it's failed
-
-v0.1-dev
-  the first dev-version.