check-taskr 1.1.2 → 1.1.3

data/Rakefile

@@ -18,6 +18,7 @@ begin
     gem.add_dependency "json"
     gem.add_dependency "haml"
     gem.add_dependency "log4r"
+    gem.add_dependency "xmpp4r"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/bin/check-taskr

@@ -10,7 +10,7 @@ require 'sinatra'
 
 require 'log4r'
 require "log4r/outputter/datefileoutputter"
-include Log4r
+
 require "check-taskr"
 
 filename = "jobs"
@@ -20,6 +20,12 @@ if ARGV.size > 0
   logdir = File.dirname(File.realdirpath(filename)) + "/logs"
 end
 
+log = Log4r::Logger.new('default')
+log.outputters = Log4r::DateFileOutputter.new('check_log', :dirname => logdir)
+log.level = Log4r::DEBUG
+
+log.debug("load #{filename} file, log on #{logdir} ...")
+
 CheckTaskr::Cli.execute(filename, :logdir => logdir)
 config = CheckTaskr::JobsConfiguration.instance
 

data/jobs.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 JobsConfiguration.init(:port => 4899) do |check|
-  check.log_level WARN
+  check.log_level DEBUG
 
   check.setup_tcp_port :error_code => 10231
 
@@ -9,9 +9,15 @@ JobsConfiguration.init(:port => 4899) do |check|
   check.tcp_port "NotExistsDB", :hosts => "10.251.251.38", :port => 18299, :error_msg => "这一服务没有打开"
 
   check.http_returncode "HudsonWeb", :hosts => ["10.241.12.38", "10.241.12.40"],
-                 :port => 8099, :error_code => 909915
+                  :port => 8099, :error_code => 909915
 
   check.http_json "Sujie", :hosts => ["10.241.38.75", "10.241.38.22", "10.241.12.38", "10.241.14.35"],
-                 :port => 8080, :path => "/admin/msg_admin_check_status", :error_code => 324234
+                  :port => 8080, :path => "/admin/msg_admin_check_status", :error_code => 324234
 
+  #  xmpp0004@mim.snda=f18f13ea13af3127ad06f194ebabe602
+  #  xmpp0003@mim.snda=778108e5e15a96b6e4becc9b59571414
+  check.xmpp_chat "XMPP", :hosts => "test.mim.iccs.sdo.com", :port => 5222,
+      :jid1 => "xmpp0004@mim.snda", :password1 => 'f18f13ea13af3127ad06f194ebabe602',
+      :jid2 => "xmpp0003@mim.snda", :password2 => "778108e5e15a96b6e4becc9b59571414",
+      :error_code => "32420001", :error_msg => "failed!"
 end

data/lib/check-taskr/base.rb

@@ -17,6 +17,7 @@ module CheckTaskr
   class JobsConfiguration
 
     include Singleton
+    include Log4r
 
     attr_accessor :sleep_time, :results, :listen_port, :locked
     attr_reader :load_paths, :actions
@@ -54,13 +55,13 @@ module CheckTaskr
     end
 
     def execute_all
+      log = Log4r::Logger['default']
       return if @locked
-      log = Logger['default']
-
       results = Hash.new
       had_error = false
 
       fail_actions = run_actions(@actions, results)
+
       # 如果有失败，过0.1秒后重试失败的
       if fail_actions.size > 0
         sleep(0.1)
@@ -77,7 +78,7 @@ module CheckTaskr
 
     def run_actions(actions, results)
       fail_actions = []
-      log = Logger['default']
+      log = Log4r::Logger['default']
       actions.each do |action|
         hash = action.execute
         unless hash.nil?
@@ -109,13 +110,13 @@ module CheckTaskr
 
     # set log level
     def log_level(level)
-      log = Logger['default']
+      log = Log4r::Logger['default']
       log.level = level
     end
 
     # process hosts from options
     def process_hosts(options)
-      log = Logger['default']
+      log = Log4r::Logger['default']
       hosts = options.delete(:hosts)
       if block_given?
         if hosts.nil?

data/lib/check-taskr/cli.rb

@@ -2,20 +2,16 @@
 require "fastthread"
 require "check-taskr/base"
 
-
 Dir[File.join(File.dirname(__FILE__), 'task/*.rb')].sort.each { |lib| require lib }
 
 module CheckTaskr
+  include Log4r
+
   class Cli
 
     def self.execute(filename, options = {})
       logdir = options.delete(:logdir)
       # create a logger named 'mylog' that logs to stdout
-      log = Logger.new 'default'
-      log.outputters =  Log4r::DateFileOutputter.new('check_log', :dirname => logdir)
-      log.level = WARN
-
-      log.debug("load #{filename} file, log on #{logdir} ...")
 
       config = CheckTaskr::JobsConfiguration.instance
       config.load_from_file(filename)

data/lib/check-taskr/task/http_code.rb

@@ -35,7 +35,7 @@ module CheckTaskr
     end
 
     def execute
-      log = Logger['default']
+      log = Log4r::Logger['default']
       log.debug "http action: ip=#{@ip}, port=#{@port}, name=#{@name}"
       hash = {:stat => 0, :ip => @ip, :msg => "OK", :error_id => @error_code }
       begin

data/lib/check-taskr/task/http_json.rb

@@ -35,7 +35,7 @@ module CheckTaskr
     end
 
     def execute
-      log = Logger['default']
+      log = Log4r::Logger['default']
       hash = {:stat => 0, :ip => @ip, :msg => "OK", :error_id => @error_code }
       begin
         Net::HTTP.start(@ip, @port) do |http|

data/lib/check-taskr/task/http_result.rb

@@ -29,13 +29,13 @@ module CheckTaskr
       @path = options[:path] || "/"
       @method = options[:method] || :get
       @post_data = options[:post_data]
-      @expect_result = options[:expect_result] || "200"  #默认期望返回200
+      @expect_result = options[:expect_result] || "ok"  #默认期望返回200
       @error_code = options[:error_code] || @@default_error_code
       @error_msg = options[:error_msg] || @@default_error_msg
     end
 
     def execute
-      log = Logger['default']
+      log = Log4r::Logger['default']
       log.debug "http action: ip=#{@ip}, port=#{@port}, name=#{@name}"
       hash = {:stat => 0, :ip => @ip, :msg => "OK", :error_id => @error_code }
       begin
@@ -52,9 +52,9 @@ module CheckTaskr
           end
           result = response.body
           hash[:timestamp] = Time.now.to_i
-          unless @expect_result.eql?(result)
+          unless result.include?(@expect_result)
             hash[:stat] = 1
-            hash[:msg] = "HTTP #{@method.to_s} #{@path}期望返回\"#{@expect_result}\",但返回\"#{result}\""
+            hash[:msg] = "HTTP #{@method.to_s} #{@path}期望返回值包含\"#{@expect_result}\",但返回\"#{result}\""
             log.warn hash.to_json
           end
         end

data/lib/check-taskr/task/sockets.rb

@@ -35,7 +35,7 @@ module CheckTaskr
     end
 
     def execute
-      log = Logger['default']
+      log = Log4r::Logger['default']
       log.debug "action: ip=#{@ip}, port=#{@port}, name=#{@name}"
       hash = { :stat => 0, :ip => @ip, :msg => "OK", :timestamp => Time.now.to_i, :error_id => @error_code }
       begin

data/lib/check-taskr/task/xmpp_chat.rb

@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+require 'net/http'
+require 'uuid'
+require 'xmpp4r'
+
+module CheckTaskr
+
+  class JobsConfiguration
+
+    def setup_xmpp_chat(options)
+      HttpReturnCodeAction.setup(options)
+    end
+
+    def xmpp_chat(name, options = {})
+      process_hosts(options) do |host|
+        action = XmppChatAction.new({:name => "#{name}-#{host}", :ip => host}.merge(options))
+        @actions << action
+      end
+    end
+  end
+
+  class XmppChatAction < JobsAction
+    attr_accessor :ip, :port, :sjid1, :jid1, :password1, :sjid2, :jid2, :password2, :error_code, :error_msg, :client1, :client2, :is_failed
+
+    include Socket::Constants
+
+    def initialize(options)
+      @name ||= options[:name]
+      @ip = options[:ip]
+      @port = options[:port] || 5222
+      @sjid1 = options[:jid1]
+      @password1 = options[:password1]
+      @sjid2 = options[:jid2]
+      @password2 = options[:password2]
+      @error_code = options[:error_code] || @@default_error_code
+      @error_msg = options[:error_msg] || @@default_error_msg
+
+      login1
+      login2
+    end
+
+    def login1
+      @jid1 = Jabber::JID.new("#{@sjid1}/check-taskr")
+      if !@client1.nil? && @client1.is_connected?
+        @client1.close
+      end
+      @client1 = Jabber::Client.new(@jid1)
+      @client1.connect(@ip, @port)
+      @client1.auth(@password1)
+      @client1.send(Jabber::Presence.new.set_show(:chat).set_status('check-taskr!'))
+    end
+
+    def login2
+      @jid2 = Jabber::JID.new("#{@sjid2}/check-taskr")
+      if !@client2.nil? && @client2.is_connected?
+        @client2.close
+      end
+      @client2 = Jabber::Client.new(@jid2)
+      @client2.add_message_callback do |m|
+      if m.type != :error
+        @message_body = m.body
+      end
+    end
+      @client2.connect(@ip, @port)
+      @client2.auth(@password2)
+      @client2.send(Jabber::Presence.new.set_show(:chat).set_status('check-taskr!'))
+    end
+
+    def execute
+      log = Log4r::Logger['default']
+      log.debug "xmpp action: ip=#{@ip}, port=#{@port}, name=#{@name}"
+      hash = {:stat => 0, :ip => @ip, :msg => "OK", :error_id => @error_code }
+      begin
+        unless @client1.is_connected?
+          login1
+        end
+
+        unless @client2.is_connected?
+          login2
+        end
+
+        body = UUID.generate
+        message = Jabber::Message::new(@jid2, body).set_type(:normal).set_id('1')
+        @client1.send(message)
+
+        sleep(0.2)
+
+        hash[:timestamp] = Time.now.to_i
+        unless body.eql?(@message_body)
+          hash[:stat] = 3
+          hash[:msg] = "在0.2秒内没有收到回应"
+        end
+
+      rescue Exception => e
+        hash[:stat] = 2
+        hash[:timestamp] = Time.now.to_i
+        hash[:msg] = "XMPP异常：#{e}"
+        log.error hash.to_json
+      end
+      hash
+    end
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - crazycode
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 +08:00
+date: 2011-01-17 00:00:00 +08:00
 default_executable: check-taskr
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: xmpp4r
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
 description: check taskr for sdo
 email: crazycode@gmail.com
 executables: 
@@ -106,6 +119,7 @@ files:
 - lib/check-taskr/task/http_json.rb
 - lib/check-taskr/task/http_result.rb
 - lib/check-taskr/task/sockets.rb
+- lib/check-taskr/task/xmpp_chat.rb
 - test/helper.rb
 - test/test_check-runner.rb
 has_rdoc: true