Changeset 3048

Timestamp:

05/05/2009 08:37:42 AM (11 months ago)

Author:

brian

Message:

Added the hostname to the Condor IDs to enable multiple schedds.

Files:

• PBSMon/setup.py (modified) (1 diff)
• PBSMon/src/rcf/condor/watchCondorEvents.py (modified) (2 diffs)

PBSMon/setup.py

@@ -40 +40 @@
-          'console_scripts': [
-              'pbs_db_upload = rcf.pbs.parsePbsLogs:main',
+              'condor_upload = rcf.condor.watchCondorEvents:main',
-              'pbs_web = rcf.pbs.web:main',
-              'pbs_history_snapshot = rcf.pbs.calculateSnapshots:main',

PBSMon/src/rcf/condor/watchCondorEvents.py

@@ -3 +3 @@
-import sys
-import time
+import socket
-import xml.sax
-import threading
@@ -229 +230 @@
-        super(CondorUploader, self).__init__()
-        self.conn = conn
+        self.hostname = socket.gethostname()
-
-    def eventCallback(self, id, info):
-        etype = info.get('EventTypeNumber', -1)
+        info['GlobalJobId'] = '%s.%s' % (self.hostname, info['GlobalJobId'])
-        user_info = (info['GlobalJobId'], 
-                info.get('x509userproxysubject', info.get('Owner', 'UNKNOWN')),