zabbirc 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9d8c1091728d3264d635cc99793e3045d22b470
-  data.tar.gz: 36ae7b2cf8b1abad8b80da24c27151fb654646f7
+  metadata.gz: 0442b2c7c53bf6dafea3ea822c5782d94b7ba20f
+  data.tar.gz: c04aa4f8923eba8a611e44fd3192d0f63c287045
 SHA512:
-  metadata.gz: c0074a1b17ee56e6fd2d5624838e966b15a9ce4b264bb12e8d18ebd4d801701a41bcb3bc59bf6b41c320bc45b4c0b83133617a94a23a6231b202e34e8f10c51b
-  data.tar.gz: 62b9cda3a95029d4378844269885a7a0f9a324d87cc51385545b2614b01acadbc65fcd51907de343767bae30ca6d29b91cef10cde7c53685953fa1b7be747b28
+  metadata.gz: a77d8bab630b1fea6945384de58ed5e884fcc8689de3304a73ff8cdfff57358f14bc439a319333690fbf8228e28ddfa694921dcee152866bc94142d3c91e8c96
+  data.tar.gz: 170bd4acf9dd5acf23ac20bab8c63391416328d2458ea2860acdbd081d078580af681f27ab84b4181feb5bf2d101f28117f7a496ad51c4f7a32b39b16c6885d0

data/lib/zabbirc/irc/plugin.rb

@@ -9,9 +9,9 @@ module Zabbirc
       listen_to :join, method: :sync_ops
       listen_to :leaving, method: :sync_ops
 
-      match /zabbirc help\s*/, method: :zabbirc_help
-      match /zabbirc help (.+)/, method: :zabbirc_help_detail
-      match /zabbirc status\s*/, method: :zabbirc_status
+      match /zabbirc help\s*$/, method: :zabbirc_help
+      match /zabbirc help (.+)\s*$/, method: :zabbirc_help_detail
+      match /zabbirc status\s*$/, method: :zabbirc_status
 
       # Settings
       register_help "settings", "Show your op specific settings. Usage: !settings"

data/lib/zabbirc/irc/plugin_methods.rb

@@ -15,6 +15,8 @@ module Zabbirc
         end
         msg << "#{m.user.nick}: Identified ops: #{ops_msg.join(", ")}"
         m.reply msg.join("\n")
+      rescue Zabbix::NotConnected => e
+        rescue_not_connected m, e
       end
 
       def acknowledge_event m, eventid, message
@@ -28,6 +30,8 @@ module Zabbirc
         else
           m.reply "#{op.nick}: Could not acknowledge event `#{event.label}`"
         end
+      rescue Zabbix::NotConnected => e
+        rescue_not_connected m, e
       end
 
       def host_status m, host
@@ -48,6 +52,8 @@ module Zabbirc
           end
         end
         m.reply msg.join("\n")
+      rescue Zabbix::NotConnected => e
+        rescue_not_connected m, e
       end
 
       def host_latest m, host, limit
@@ -68,6 +74,8 @@ module Zabbirc
           end
         end
         m.reply msg.join("\n")
+      rescue Zabbix::NotConnected => e
+        rescue_not_connected m, e
       end
 
       def sync_ops m, u=nil
@@ -111,7 +119,7 @@ module Zabbirc
           m.reply "#{op.nick}: uknown value `#{value}`. Allowed values: true, on, 1, false, off, 0"
           return
         end
-        m.reply "#{op.nick}: setting `notify` was set to `#{op.setting.get :notify}`"
+        m.reply "#{op.nick}: setting `notify` has been set to `#{op.setting.get :notify}`"
       end
 
       def set_events_priority m, op, value
@@ -127,7 +135,7 @@ module Zabbirc
           return
         end
         op.setting.set :events_priority, priority.code
-        m.reply "#{op.nick}: setting `events_priority` was set to `#{op.setting.get :events_priority}`"
+        m.reply "#{op.nick}: setting `events_priority` has been set to `#{op.setting.get :events_priority}`"
       end
 
       def set_primary_channel m, op, value
@@ -143,7 +151,7 @@ module Zabbirc
           m.reply "#{op.nick}: uknown value `#{value}`. Allowed values: #{channel_names.join(", ")}"
           return
         end
-        m.reply "#{op.nick}: setting `primary_channel` was set to `#{op.setting.get :primary_channel}`"
+        m.reply "#{op.nick}: setting `primary_channel` has been set to `#{op.setting.get :primary_channel}`"
       end
 
       ### Events
@@ -159,6 +167,8 @@ module Zabbirc
                 "#{op.nick}: No last events"
               end
         m.reply msg
+      rescue Zabbix::NotConnected => e
+        rescue_not_connected m, e
       end
 
       def ops
@@ -217,6 +227,12 @@ module Zabbirc
           false
         end
       end
+
+      def rescue_not_connected m, e
+        op = get_op m
+        return unless op
+        m.reply "#{op.nick}: #{e.to_s}"
+      end
     end
   end
 end

data/lib/zabbirc/op.rb

@@ -70,6 +70,7 @@ module Zabbirc
 
     def event_notified event
       @notified_events[event.id] = Time.now
+      clear_notified_events
     end
 
     private

data/lib/zabbirc/op_list.rb

@@ -32,9 +32,9 @@ module Zabbirc
     def remove op
       case op
       when String
-        @ops[op] = nil
+        @ops.delete(op)
       when Op
-        @ops[op.login] = nil
+        @ops.delete(op.login)
       else
         raise ArgumentError, "Stirng or Op expected"
       end
@@ -48,16 +48,22 @@ module Zabbirc
       self.class.new(find_all{ |op| op.interested_in? event })
     end
 
-    def notify event
+    def interested
+      self.class.new(find_all{ |op| op.setting.get :notify })
+    end
+
+    def notify object
+      message = case object
+                when String
+                  object
+                when Zabbix::Event
+                  object.label
+                end
       group_by(&:primary_channel).each do |channel, ops|
-        begin
-          next if channel.nil?
-          op_targets = ops.collect{|op| "#{op.nick}:" }.join(" ")
-          channel.send "#{op_targets} #{event.label}"
-          ops.each{ |op| op.event_notified event }
-        rescue =>e
-          binding.pry
-        end
+        next if channel.nil?
+        op_targets = ops.collect{|op| "#{op.nick}:" }.join(" ")
+        channel.send "#{op_targets} #{message}"
+        ops.each{ |op| op.event_notified object } if object.is_a? Zabbix::Event
       end
     end
 

data/lib/zabbirc/services/events.rb

@@ -10,6 +10,11 @@ module Zabbirc
             @service.ops.interested_in(event).notify event
           end
         end
+      rescue Zabbix::NotConnected => e
+        if Zabbix::Connection.up?
+          @service.ops.interested.notify e.to_s
+          Zabbix::Connection.down!
+        end
       end
 
       private
@@ -20,12 +25,6 @@ module Zabbirc
           events.sort_by{|e| e.created_at }.last
         end
       end
-
-      def send_notifications op, events
-        events.each do |event|
-          op.notify event
-        end
-      end
     end
   end
 end

data/lib/zabbirc/services/ops.rb

@@ -3,6 +3,11 @@ module Zabbirc
     class Ops < Base
       def iterate
         sync_ops
+      rescue Zabbix::NotConnected => e
+        if Zabbix::Connection.up?
+          @service.ops.interested.notify e.to_s
+          Zabbix::Connection.down!
+        end
       end
 
       private
@@ -22,7 +27,7 @@ module Zabbirc
             sync_irc channel
           end
         end
-        @service.ops.dump_settings
+        # @service.ops.dump_settings
       end
 
       def sync_irc channel

data/lib/zabbirc/zabbix/connection.rb

@@ -9,11 +9,29 @@ module Zabbirc
         Thread.current[:zabbix_connection] ||= self.new
       end
 
+      def self.down!
+        @@down = true
+      end
+
+      def self.down?
+        @@down == true
+      end
+
+      def self.up!
+        @@down = false
+      end
+
+      def self.up?
+        @@down == false
+      end
+
       def self.test_connection
         self.new
+        self.up!
         true
       rescue => e
         Zabbirc.logger.fatal "Could not connect to zabbix: #{e}"
+        self.down!
         false
       end
 
@@ -22,5 +40,16 @@ module Zabbirc
         @client.user.login(user: Zabbirc.config.zabbix_login, password: Zabbirc.config.zabbix_password)
       end
     end
+
+    class NotConnected < StandardError
+      attr_reader :original_exception
+      def initialize original_exception
+        @original_exception = original_exception
+      end
+
+      def to_s
+        "Cannot connect to Zabbix API: #{original_exception{}}"
+      end
+    end
   end
 end

data/lib/zabbirc/zabbix/resource/finders.rb

@@ -8,27 +8,33 @@ module Zabbirc
                                               :"#{model_name}ids" => id
                                           })
           res = api.send(model_name).get options
-          if res.size == 0
-            nil
-          elsif res.size > 1
-            raise IDNotUniqueError, "#{model_name.camelize} ID `#{id}` is not unique"
-          else
-            self.new res.first
-          end
+          ret = if res.size == 0
+                  nil
+                elsif res.size > 1
+                  raise IDNotUniqueError, "#{model_name.camelize} ID `#{id}` is not unique"
+                else
+                  self.new res.first
+                end
         rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED => e
           Zabbirc.logger.error "Zabbix::Resource#find: #{e}"
-          nil
+          raise NotConnected, e
+        else
+          Connection.up!
+          ret
         end
 
         def get *options
           options = options.extract_options!
           res = api.send(model_name).get options
-          res.collect do |obj|
+          ret = res.collect do |obj|
             self.new obj
           end
         rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED => e
           Zabbirc.logger.error "Zabbix::Resource#get: #{e}"
-          []
+          raise NotConnected, e
+        else
+          Connection.up!
+          ret
         end
 
       end

data/spec/bot_spec.rb

@@ -154,7 +154,7 @@ describe Zabbirc::Irc::PluginMethods do
 
   describe "#set_setting" do
     shared_examples "set_setting" do |key, value, expected_setting_value|
-      let(:expected_msg) { "#{mock_nick}: setting `#{key}` was set to `#{expected_setting_value}`" }
+      let(:expected_msg) { "#{mock_nick}: setting `#{key}` has been set to `#{expected_setting_value}`" }
       let(:op) { bot.get_op mock_nick }
       it "should set #{key} setting to #{value}" do
         expect(mock_message).to receive(:reply).with(expected_msg)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbirc
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Filip Zachar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport