ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/ReportUploader.py
(Generate patch)

Comparing COMP/CRAB/python/ReportUploader.py (file contents):
Revision 1.4 by mcinquil, Wed Nov 3 11:41:32 2010 UTC vs.
Revision 1.6 by mcinquil, Tue Feb 1 14:10:44 2011 UTC

# Line 28 | Line 28 | class ReportUploader( Actor ):
28          try:
29              CliServerParams(self)
30              self.requestedserver = 'default'
31 <            if self.cfg_params.has_key("server_name"):
32 <                self.requestedserver = self.cfg_params['server_name']
31 >            if self.cfg_params.has_key("CRAB.server_name"):
32 >                self.requestedserver = self.cfg_params['CRAB.server_name']
33 >            if self.cfg_params.has_key("CRAB.use_server"):
34 >                if int(self.cfg_params['CRAB.use_server']) == 0:
35 >                    self.server_name = 'No server'
36          except Exception, ex:
37              common.logger.debug("Problem '%s'" % str(ex))
38 +            import traceback
39 +            common.logger.debug(str(traceback.format_exc()))
40              self.server_name = 'No server'
41              self.requestedserver = 'No server'
42  
38            
43          self.taskpath = common.work_space.topDir()
44  
45          if os.path.exists( self.taskpath ) is True:
# Line 72 | Line 76 | class ReportUploader( Actor ):
76              self.dashbtaskmon = val
77          common.logger.debug('Using %s as link for dashboard task monitoring' % self.dashbtaskmon )
78  
75        #val = getCentralConfigLink('servTaskMon')
76        #if val is not None and len(val) > 0:
77        #    self.centralservermon = val
78        #common.logger.debug('Using %s as link for central server monitoring (it allows to bypass cern firewall)' % self.centralservermon )
79
79  
80      def __prepareMetadata( self, datafile ):
81          """
# Line 89 | Line 88 | class ReportUploader( Actor ):
88          strmeta = 'username:%s\n' % self.username + \
89                    'version:%s\n' % '%s_%s' % (common.prog_name.upper(), common.prog_version_str) + \
90                    'jobuuid:%s\n' % self.taskname + \
91 <                  'monitoringlink:Dashboard monitoring,%s%s \n' %(self.dashbtaskmon,self.taskname) # + \
91 >                  'monitoringlink:Dashboard Task Mon,%s%s \n' %(self.dashbtaskmon,self.taskname) # + \
92          if self.server_name != 'No server':
93 <            cservermon = 'http://%s:8888/visualog/?logtype=Status&taskname=%s\n' % (self.server_name, self.taskname)
94 <            strmeta += 'monitoringlink:CrabServer monitoring,%s\n' % cservermon # + \
95 <                       #'monitoringlink:CentralServer monitoring,%s%s\n' % (self.centralservermon, cservermon.replace('logtype=Status&', 'logtype=Status|')) + \
93 >            cserverStatus = 'http://%s:8888/visualog/?logtype=Status&taskname=%s\n' % (self.server_name, self.taskname)
94 >            strmeta += 'monitoringlink:CrabServer Status,%s\n' % cserverStatus
95 >            cserverLog = 'http://%s:8888/visualog/?logtype=Logging&taskname=%s\n' % (self.server_name, self.taskname)
96 >            strmeta += 'monitoringlink:CrabServer Logging,%s\n' % cserverLog
97  
98          fmeta.write( strmeta )
99          fmeta.close()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines