Defer creating the event client and queue.

The event queue initializer looks up event transformers too early so
defer creating the queue until after connecting to ZenHub.

ZEN-35073

Products/ZenEvents/zentrap/app.py

@@ -57,7 +57,7 @@ class TrapDaemon(PBDaemon):
     def __init__(self, *args, **kwargs):
         super(TrapDaemon, self).__init__(*args, **kwargs)
 
-        self.configCycleInterval = 20 * 60  # seconds
+        self.configCycleInterval = 2 * 60  # seconds
         self.cycleInterval = 5 * 60  # seconds
 
         self.__lastCounterEventTime = time.time()
@@ -233,7 +233,6 @@ def _start_receiver(self):
             reactor.addSystemEventTrigger(
                 "before", "shutdown", self._receiver.stop
             )
-
             reactor.addSystemEventTrigger(
                 "after", "shutdown", self._displayStatistics
             )

Products/ZenEvents/zentrap/filterspec.py

@@ -100,7 +100,7 @@ def update_from_string(self, trapFilters, reset=True):
         self._filtersDefined = 0 != numFiltersDefined
         if self._filtersDefined:
             log.debug(
-                "Finished reading filter configuration. Lines parsed:%s, "
+                "finished reading filter configuration. Lines parsed:%s, "
                 "Filters defined:%s [v1Traps:%d, v1Filters:%d, "
                 "v2Filters:%d]",
                 lineNumber,
@@ -110,13 +110,13 @@ def update_from_string(self, trapFilters, reset=True):
                 len(self._v2Filters),
             )
         else:
-            log.warn("No zentrap filters defined.")
+            log.warn("no zentrap filters defined.")
         return events
 
     def _reset(self):
-        self._v1Traps = {}
-        self._v1Filters = {}
-        self._v2Filters = {}
+        self._v1Traps.clear()
+        self._v1Filters.clear()
+        self._v2Filters.clear()
         self._filtersDefined = False
 
     def _parseFilterDefinition(self, line, lineNumber):
@@ -165,7 +165,7 @@ def _parseFilterDefinition(self, line, lineNumber):
                 return None
         except Exception:
             errorMessage = (
-                "Could not compile collector expression {!r} on "
+                "could not compile collector expression {!r} on "
                 "line {}".format(collectorRegex, lineNumber)
             )
             log.error(errorMessage)
@@ -439,13 +439,14 @@ def __init__(
         self.genericTrap = genericTrap
 
     def __eq__(self, other):
-        if isinstance(other, GenericTrapFilterDefinition):
-            return self.genericTrap == other.genericTrap
-        else:
-            return False
+        if not isinstance(other, GenericTrapFilterDefinition):
+            return NotImplemented
+        return self.genericTrap == other.genericTrap
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        if not isinstance(other, GenericTrapFilterDefinition):
+            return NotImplemented
+        return self.genericTrap != other.genericTrap
 
     def __hash__(self):
         return hash(self.genericTrap)
@@ -462,13 +463,14 @@ def levels(self):
         return countOidLevels(self.oid)
 
     def __eq__(self, other):
-        if isinstance(other, OIDBasedFilterDefinition):
-            return self.oid == other.oid
-        else:
-            return False
+        if not isinstance(other, OIDBasedFilterDefinition):
+            return NotImplemented
+        return self.oid == other.oid
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        if not isinstance(other, OIDBasedFilterDefinition):
+            return NotImplemented
+        return self.oid != other.oid
 
     def __hash__(self):
         return hash(self.oid)

Products/ZenEvents/zentrap/handlers.py

@@ -86,16 +86,15 @@ def __call__(self, addr, pdu, starttime):
             )
 
         result["zenoss.trap_source_ip"] = addr[0]
+        community = self.getCommunity(pdu)
+        self.sendTrapEvent(result, community, eventType, starttime)
         log.debug(
-            "asyncHandleTrap: eventType=%s oid=%s snmpVersion=%s",
+            "handled trap  event-type=%s oid=%s snmp-version=%s",
             eventType,
             result["oid"],
             result["snmpVersion"],
         )
 
-        community = self.getCommunity(pdu)
-        self.sendTrapEvent(result, community, eventType, starttime)
-
     def sendTrapEvent(self, result, community, eventType, starttime):
         summary = "snmp trap %s" % eventType
         log.debug(summary)

Products/ZenEvents/zentrap/receiver.py

@@ -25,7 +25,7 @@
     sockaddr_in6,
 )
 
-log = logging.getLogger("zen.zentrap.server")
+log = logging.getLogger("zen.zentrap.receiver")
 
 
 class Receiver(object):