zenoss-commit Mailing List for Zenoss Community Edition (Page 196)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: jstevens
Date: 2007-04-05 10:23:34 -0400 (Thu, 05 Apr 2007)
New Revision: 4520

Added:
   trunk/Products/ZenHub/services/RRDService.py
   trunk/Products/ZenHub/services/WebConfig.py
Modified:
   trunk/Products/ZenHub/HubService.py
   trunk/Products/ZenHub/PBDaemon.py
Log:
Beginning of rrdservice and webconfig.  PBDaemon includes some code
from RRDDaemon to include an automagically reconnecting pb factory.


Modified: trunk/Products/ZenHub/HubService.py
===================================================================

--- trunk/Products/ZenHub/HubService.py	2007-04-05 14:14:55 UTC (rev 4519)
+++ trunk/Products/ZenHub/HubService.py	2007-04-05 14:23:34 UTC (rev 4520)
@@ -12,10 +12,6 @@
         self.instance = instance
         self.listeners = []
 
-    def getMonitor(monitorType='Performance'):
-        container = getattr(self.dmd.Monitors, monitorType, None)
-        return container and container._getOb(self.instance)
-
     def update(self, object):
         pass
 

Modified: trunk/Products/ZenHub/PBDaemon.py
===================================================================
--- trunk/Products/ZenHub/PBDaemon.py	2007-04-05 14:14:55 UTC (rev 4519)
+++ trunk/Products/ZenHub/PBDaemon.py	2007-04-05 14:23:34 UTC (rev 4520)
@@ -13,9 +13,13 @@
 
 import Globals
 from Products.ZenUtils.ZenDaemon import ZenDaemon
+#from Products.ZenUtils.Driver import drive
 from Products.ZenUtils.Step import Step
 import Products.ZenEvents.Event as Event
+from Products.ZenUtils.PBUtil import ReconnectingPBClientFactory
 
+from Products.ZenHub.zenhub import PB_PORT
+
 from twisted.internet import reactor, defer
 from twisted.cred import credentials
 from twisted.spread import pb
@@ -46,6 +50,12 @@
 #    }
 
 
+DEFAULT_HUB_HOST = 'localhost'
+DEFAULT_HUB_PORT = PB_PORT
+DEFAULT_HUB_USERNAME = 'admin'
+DEFAULT_HUB_PASSWORD = 'zenoss'
+
+
 class PBDaemon(ZenDaemon, pb.Referenceable):
     
     name = 'pbdaemon'
@@ -56,24 +66,29 @@
         #pb.Referenceable.__init__(self)
         self.perspective = None
         self.services = {}
+        self.eventQueue = []
 
     
-    def connect(self, username, password, host='localhost', port=8789):
-        ''' Connect to zenhub.  Returns a deferred.
-        '''
-        factory = pb.PBClientFactory()
-        reactor.connectTCP("localhost", port, factory)
-        def callback(result):
-            self.perspective = result
-            return result
-        def errback(error):
-            import pdb; pdb.set_trace()
-            self.log.error('failed to connect to zenhub')
-            return error
-        d = factory.login(
-                credentials.UsernamePassword(username, password), client=self)
-        d.addCallback(callback)
-        d.addErrback(errback)
+    def connect(self):
+
+        def gotPerspective(perspective):
+            "Every time we reconnect this function is called"
+            self.log.warning("Reconnected to ZenHub")
+            self.perspective = perspective
+            d2 = self.getInitialServices()
+            if not d.called:
+                d2.chainDeferred(d)
+            
+        d = defer.Deferred()
+        factory = ReconnectingPBClientFactory()
+        self.log.debug("Connecting to %s", self.options.hubHost)
+        reactor.connectTCP(self.options.hubHost, self.options.hubPort, factory)
+        username = self.options.username
+        password = self.options.password
+        self.log.debug("Logging in as %s", username)
+        c = credentials.UsernamePassword(username, password)
+        factory.gotPerspective = gotPerspective
+        factory.startLogin(c)
         return d
 
 
@@ -94,47 +109,78 @@
             self.log.debug('errback after getting service %s' % serviceName)
             self.log.error('Could not retrieve service %s' % serviceName)
             return error
-        d = self.perspective.callRemote('getService', serviceName, self)
+        d = self.perspective.callRemote('getService', serviceName)
         d.addCallback(callback, serviceName)
         d.addErrback(errback, serviceName)
         return d
-        
 
-    def setupConnectionAndServices(self):
-        ''' Connects to zenhub and sets up services listed in 
-        self.initialServices.
-        This is a generator that is used with a call to Step.  
-        '''
-        self.log.debug('setupConnectAndServices')
-        d = self.connect(self.options.username,
-                            self.options.password,
-                            self.options.hubAddress,
-                            self.options.hubPort)
-        yield d
+            
+    def getInitialServices(self):
         self.log.debug('setting up services %s' %
                 ', '.join([n for n in self.initialServices]))
         d = defer.DeferredList(
             [self.getService(name) for name in self.initialServices])
-        yield d
-        self.connected()
-
-
+        return d
+        
+        
     def connected(self):
         self.log.debug('connected')
         self.eventSvc = self.services['EventService']
+        self.eventSvc.callRemote('sendEvent', startEvent)
         
     
     def run(self):
         self.log.debug('run')
-        d = Step(self.setupConnectionAndServices())
+        d = self.connect()
+        def callback(result):
+            self.connected()
+            return result
+        def errback(error):
+            self.log.error('Unable to connect to zenhub.')
+            self.stop()
+        d.addCallbacks(callback, errback)
         reactor.run()
+        self.log.info('%s shutting down' % self.name)
 
 
+    def stop(self):
+        if reactor.running:
+            reactor.stop()
+        
+        
+    def sendEvent(self, event=None):
+        ''' Add event to queue of events to be sent.  If we have an event
+        service then process the queue.
+        '''
+        def errback(error, event):
+            # If we get an error when sending an event we add it back to the 
+            # queue.  This is great if the eventservice is just temporarily
+            # unavailable.  This is not so good if there is a problem with
+            # this event in particular, in which case we'll repeatedly 
+            # attempt to send it.  We need to do some analysis of the error
+            # before sticking event back in the queue.
+            #
+            # Maybe this is overkill and if we have an operable
+            # event service we should just log events that don't get sent
+            # and then drop them.
+            self.log.error('Error sending event')
+            self.eventQueue.append(event)
+        if event:
+            self.eventQueue.append(event)
+        if self.eventSvc:
+            for i in range(len(self.eventQueue)):
+                event = self.eventQueue[0]
+                del self.eventQueue[0]
+                d = self.eventSvc.callRemote('sendEvent', event)
+                d.addErrback(errback, event)
+
+
     def remote_getName(self):
         return self.name
 
 
     def remote_shutdown(self, result):
+        self.stop()
         try:
             self.sigTerm()
         except SystemExit:
@@ -144,21 +190,24 @@
 
     def buildOptions(self):
         ZenDaemon.buildOptions(self)
-        self.parser.add_option('--hub-addr',
-                                dest='hubAddress',
-                                default='localhost',
-                                help='Address of zenhub daemon.'
-                                ' Default is localhost.')
+        self.parser.add_option('--hub-host',
+                                dest='hubHost',
+                                default=DEFAULT_HUB_HOST,
+                                help='Host of zenhub daemon.'
+                                ' Default is %s.' % DEFAULT_HUB_HOST)
         self.parser.add_option('--hub-port',
                                 dest='hubPort',
-                                default=8789,
-                                help='Port zenx listens on.  Default is 8789')
+                                default=DEFAULT_HUB_PORT,
+                                help='Port zenhub listens on.'
+                                    'Default is %s.' % DEFAULT_HUB_PORT)
         self.parser.add_option('--username',
                                 dest='username',
-                                default='admin',
-                                help='Username for zenhub login')
+                                default=DEFAULT_HUB_USERNAME,
+                                help='Username for zenhub login.'
+                                    ' Default is %s.' % DEFAULT_HUB_USERNAME)
         self.parser.add_option('--password',
                                 dest='password',
-                                default='zenoss',
-                                help='Password for zenhub login')
+                                default=DEFAULT_HUB_PASSWORD,
+                                help='Password for zenhub login.'
+                                    ' Default is %s.' % DEFAULT_HUB_PASSWORD)
 

Added: trunk/Products/ZenHub/services/RRDService.py

Added: trunk/Products/ZenHub/services/WebConfig.py





2007	Jan	Feb (65)	Mar (276)	Apr (544)	May (638)	Jun (225)	Jul (204)	Aug (294)	Sep (532)	Oct (506)	Nov (324)	Dec (359)
2008	Jan (208)	Feb (225)	Mar (248)	Apr (388)	May (222)	Jun (47)	Jul	Aug	Sep	Oct	Nov	Dec

zenoss-commit Mailing List for Zenoss Community Edition (Page 196)

Zenoss - Intelligent IT Operations Management

zenoss-commit — svn commit list