perfsonar development work

Author: gijs
Date: 2007-03-02 09:47:29 -0500 (Fri, 02 Mar 2007)
New Revision: 2177

Removed:
   trunk/perfsonar/contrib/FlowMP-manager/process.log
Modified:
   trunk/perfsonar/contrib/FlowMP-client/flowmpclient.py
   trunk/perfsonar/contrib/FlowMP-manager/common.py
   trunk/perfsonar/contrib/FlowMP-manager/config.py
   trunk/perfsonar/contrib/FlowMP-manager/manager.py
Log:

small code improvements. Encryptions keys are now generated by flow MP 
service.



Modified: trunk/perfsonar/contrib/FlowMP-client/flowmpclient.py
===================================================================
--- trunk/perfsonar/contrib/FlowMP-client/flowmpclient.py       2007-03-02 
14:31:59 UTC (rev 2176)
+++ trunk/perfsonar/contrib/FlowMP-client/flowmpclient.py       2007-03-02 
14:47:29 UTC (rev 2177)
@@ -69,7 +69,7 @@
 
     def keepAlive(self):
         """send keepalive to netflow MP"""
-        logging.info("sending keepalive to service")
+        logging.debug("sending keepalive to service")
         if not self.clientID:
             logging.warning("can't sent keepalive, got no clientID")
             return False

Modified: trunk/perfsonar/contrib/FlowMP-manager/common.py
===================================================================
--- trunk/perfsonar/contrib/FlowMP-manager/common.py    2007-03-02 14:31:59 
UTC (rev 2176)
+++ trunk/perfsonar/contrib/FlowMP-manager/common.py    2007-03-02 14:47:29 
UTC (rev 2177)
@@ -1,21 +1,22 @@
 
 import os
 import logging
+from elementtree.ElementTree import ElementTree
 
 logging.basicConfig(level=logging.DEBUG,
                     format='%(asctime)s %(levelname)s %(message)s',
                     filename='process.log',
                     filemode='a')
 
-from elementtree.ElementTree import ElementTree
+import config
 
-import config
+
   
 
 class Client:
     def __init__(self, address=None, port=None, routers=[], filter=None, \
                    netflow=None, transport=None, zebedeePid=None, 
-                   lastKeepAlive=None, id=None ):
+                   lastKeepAlive=None, id=None, key=None ):
         self.id = id
         self.address = address
         self.port = port
@@ -25,6 +26,7 @@
         self.transport = transport
         self.zebedeePid = zebedeePid
         self.lastKeepAlive = lastKeepAlive
+        self.key = key
 
 
 def readClients():
@@ -50,7 +52,7 @@
         else: client.filter = None
         client.flow = root.find('netflowVersion').text.strip()
         client.transport = root.find('transportProtocol').text.strip()
-        #client.zebedeePid = root.find('zebedee-pid').text.strip()
+        client.key = root.find('anonymizingkey').text.strip()
         
         clients.append(client)
 

Modified: trunk/perfsonar/contrib/FlowMP-manager/config.py
===================================================================
--- trunk/perfsonar/contrib/FlowMP-manager/config.py    2007-03-02 14:31:59 
UTC (rev 2176)
+++ trunk/perfsonar/contrib/FlowMP-manager/config.py    2007-03-02 14:47:29 
UTC (rev 2177)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-propFile = 
"/usr/local/gijs/tomcat/webapps/perfSONAR-FLOWMP-1.1-beta/WEB-INF/classes/perfsonar/conf/service.properties"
+propFile = 
"/usr/local/FlowSubscriptionMP/tomcat/webapps/perfSONAR-FLOWMP-1.1-beta/WEB-INF/classes/perfsonar/conf/service.properties"
 
 import re
 import sys

Modified: trunk/perfsonar/contrib/FlowMP-manager/manager.py
===================================================================
--- trunk/perfsonar/contrib/FlowMP-manager/manager.py   2007-03-02 14:31:59 
UTC (rev 2176)
+++ trunk/perfsonar/contrib/FlowMP-manager/manager.py   2007-03-02 14:47:29 
UTC (rev 2177)
@@ -72,9 +72,13 @@
         pFile = open(os.path.join(runDir, pid))
         pNum = int(pFile.readline().strip())
         logging.info("kill " + str(pNum))
-        os.kill(pNum, signal.SIGTERM)
+        try:
+            os.kill(pNum, signal.SIGTERM)
+        except OSError, err:
+            logging.error(err)
 
 
+
 def main():
     try:
         opts, args = getopt.getopt(sys.argv[1:], "hsq", ["help", "start", 
"stop"])

Deleted: trunk/perfsonar/contrib/FlowMP-manager/process.log