Changeset 458

Timestamp:

05/14/08 11:02:21 (8 months ago)

Author:

mgoldman

Message:

Tie log queries together

Files:

• branches/trunk-pmd-intproto/mgmt/manager.py (modified) (4 diffs)

branches/trunk-pmd-intproto/mgmt/manager.py

@@ -11 +11 @@
-import pprint
-import os
+from locale import atoi
+from protocol import Message
-
-class Manager:
@@ -62 +64 @@
-                msg.type = 'query'
-                msg.body = 'all'
-                return msg
-
-        def requestlog(self):
-                print "Getting logs"
-                msg = protocol.Message()
-                msg.msg = "log"
-                msg.type = "query"
-                msg.body = "ALL"
-                return msg
-
-        def requestlogdelta(self):
-                print "getting log deltas"
-                msg= protocol.Message()
-                msg.msg = "log"
-                msg.type = "query"
-                msg.body = "UPDATE"
-                return msg
-
@@ -212 +198 @@
-        return mgr.query_server(msg)
-
+def parsequery(qlist):
+        res = []
+        ips = []
+        groups = []
+        while(qlist != []):
+                tok = qlist.pop(0)
+                if tok == "time":
+                        try:
+                                res.append(("time",(atoi(qlist.pop(0)), atoi(qlist.pop(0)))))
+                        except ValueError:
+                                print "Error parsing values."
+                                raise ValueError
+                elif tok == "IP":
+                        ips.append(qlist.pop(0))
+                elif tok == "group":
+                        groups.append(qlist.pop(0))
+                else:
+                        print "Unknown token: " + tok
+                        raise ValueError
+        if ips != []:
+                res.append(("IP", ips))
+        if groups != []:
+                res.append(("group", groups))
+        return res
+
-def handlelog(manager, arglist):
-        ''' Takes a manager object and the remainder of the command
-                line arguments and processes the log command
-                Current commands: all, delta '''
-
+
+
+
+
+
+
+
+
-        if(len(arglist) == 0):
-                print useage
@@ -225 +243 @@
-                targets = (arglist[1], arglist[2:])
-        if cmd == "all":
-manager.requestlog()
+Message("log","query","ALL"
-        elif cmd == "delta":
-
+
+
+
+
+
+
+
+
-        else:
-                print useage