Changeset 488

Timestamp:

05/27/08 09:39:52 (8 months ago)

Author:

mgoldman

Message:

Added agent log pushing.

Subtracted server log pulling.

Files:

• branches/trunk-pmd-intproto/agent/agent.py (modified) (1 diff)
• branches/trunk-pmd-intproto/server/master.py (modified) (2 diffs)

branches/trunk-pmd-intproto/agent/agent.py

@@ -107 +107 @@
-                log file we have come.  Don't send all messages at every startup.
-                '''
-
-
+
+
+
+
-
-        def updated_modules(self):

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

@@ -363 +363 @@
-                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))
-                s = storage.Layer(storage_root)
-                [s.append_log_messages(id, lst) for ((clientsock,lst), id) in res]
-                s.update()
-
-        def query(self, ip, item, queryl):
-                if queryl == []:
@@ -401 +387 @@
-if __name__ == "__main__":
-        m = Master()
-        cntr = 0
-        while True:
-                print "sheep"
-                m.run2(5)
-                if(cntr % 12 == 0):
-                        m.updatelogs()
-                cntr += 1