Changeset 453

Timestamp:

05/12/08 14:06:31 (8 months ago)

Author:

mgoldman

Message:

Add server auto-download log logic.

Files:

• branches/trunk-pmd-intproto/server/master.py (modified) (4 diffs)

branches/trunk-pmd-intproto/server/master.py

@@ -58 +58 @@
-        def service_client(self):
-                pass
+
+###
+###  Auxillary functions to handle specific tasks.
+###
+###  The functions that query agents should be updated to create the 
+###  message for a specific client only.  The sending to specific (or all)
+###  clients should be handled by the function self.comm()
+###
+###  Querys against the server itself should continue to to return the msg
+###  to be sent back to the manager.
-
-        def updatep(self, (mgr, info), msg, clientid=None):
@@ -242 +252 @@
-
-        def comm(self, func, msg, (mgr, info)):
+                '''
+                This function takes a function that "personalizes" a message for
+                a particular client
+                The message to personalize,
+                and a manager and info.
+                Also, it takes a targetid.
+
+                The functions sends messages to the targets in the original message
+                and returns a list of their result pairs. '''
-                target = msg.targets
-                msg.targets = None
@@ -254 +273 @@
-                        tlist = targetexpand(target)
-                        for t in tlist:
-
+, t
-                        res = []
-                        for t in tlist:
@@ -271 +290 @@
-                return [self.service_manager(m) for m in self.manager.accept_and_wait(timeout)]
-
+        def updatelogs(self):
+                ''' Updates server side logs for all known clients. '''
+                msg = protocol.Message()
+                msg.msg = "log"
+                msg.type = "query"
+                msg.body = "UPDATE"
+                # Call the comm function to send the messages and collect the results
+                # first function just returns the message, pass in the message and
+                # None for the manager and info since we aren't going to use it.
+                res = self.comm(lambda *x: msg, msg, (None, None))
+                # FIXME: Put in code here to store the messages in the storage subsytem
+
+
-
-if __name__ == "__main__":
-        m = Master()
+        cntr = 0
-        while True:
-                print "sheep"
-                m.run2(5)
+                if(cntr % 12 == 0):
+                        m.updatelogs()
+                cntr += 1