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.2 by mcinquil, Tue Oct 26 11:06:09 2010 UTC vs.
Revision 1.3 by mcinquil, Mon Nov 1 09:46:20 2010 UTC

# Line 10 | Line 10 | class ReportUploader( Actor ):
10  
11      uploadFileServer = "http://gangamon.cern.ch/django/cmserrorreports/"
12      dashbtaskmon = 'http://dashb-cms-job-task.cern.ch/taskmon.html'
13 <    centralservermon = 'http://glidein-mon.t2.ucsd.edu:8080/dashboard/ajaxproxy.jsp?p='
13 >    #centralservermon = 'http://glidein-mon.t2.ucsd.edu:8080/dashboard/ajaxproxy.jsp?p='
14  
15      def __init__(self, cfg_params, jobid = -1):
16          """
# Line 25 | Line 25 | class ReportUploader( Actor ):
25  
26          self.cfg_params = cfg_params
27  
28 <        CliServerParams(self)
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']
33 >        except Exception, ex:
34 >            common.logger.debug("Problem '%s'" % str(ex))
35 >            self.server_name = 'No server'
36 >            self.requestedserver = 'No server'
37  
38 +            
39          self.taskpath = common.work_space.topDir()
40  
41          if os.path.exists( self.taskpath ) is True:
# Line 51 | Line 60 | class ReportUploader( Actor ):
60  
61          self.username = getUserName()
62  
54        self.requestedserver = 'default'
55        if self.cfg_params.has_key("server_name"):
56            self.requestedserver = elf.cfg_params['server_name']
57        
63          self.scheduler = common.scheduler.name()
64  
65 <        val = getCentralConfigLink('reportLogURL', 'http://cms.pg.infn.it/~cinquilli/files/crab2/')
65 >        val = getCentralConfigLink('reportLogURL')
66          if val is not None and len(val) > 0:
67              self.uploadFileServer = val
68          common.logger.debug('Using %s as remote repository server for uploading logs' % self )
69  
70 <        val = getCentralConfigLink('dashbTaskMon', 'http://cms.pg.infn.it/~cinquilli/files/crab2/')
70 >        val = getCentralConfigLink('dashbTaskMon')
71          if val is not None and len(val) > 0:
72              self.dashbtaskmon = val
73          common.logger.debug('Using %s as link for dashboard task monitoring' % self.dashbtaskmon )
74  
75 <        val = getCentralConfigLink('servTaskMon', 'http://cms.pg.infn.it/~cinquilli/files/crab2/')
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 )
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  
80  
81      def __prepareMetadata( self, datafile ):
# Line 80 | Line 85 | class ReportUploader( Actor ):
85          preparing metadata file content for errorreport server
86          """
87  
83        cservermon = 'http://%s:8888/visualog/?logtype=Status&taskname=%s\n' % (self.server_name, self.taskname)
88          fmeta = open(datafile, 'w')
89 <        fmeta.write(
90 <                     'username:%s\n' % self.username + \
91 <                     'version:%s\n' % os.path.basename(os.path.normpath(os.getenv('CRABDIR'))) + \
92 <                     'jobuuid:%s\n' % self.taskname + \
93 <                     'monitoringlink:Dashboard monitoring,%s%s \n' %(self.dashbtaskmon,self.taskname) + \
94 <                     'monitoringlink:CentralServer monitoring,%s%s\n' % (self.centralservermon, cservermon.replace('logtype=Status&', 'logtype=Status|')) + \
95 <                     'monitoringlink:CrabServer monitoring,%s\n' % cservermon
96 <                   )
89 >        strmeta = 'username:%s\n' % self.username + \
90 >                  'version:%s\n' % '%s_%s' % (common.prog_name.upper(), common.prog_version_str) + \
91 >                  'jobuuid:%s\n' % self.taskname + \
92 >                  'monitoringlink:Dashboard monitoring,%s%s \n' %(self.dashbtaskmon,self.taskname) # + \
93 >        if self.server_name != 'No server':
94 >            cservermon = 'http://%s:8888/visualog/?logtype=Status&taskname=%s\n' % (self.server_name, self.taskname)
95 >            strmeta += 'monitoringlink:CrabServer monitoring,%s\n' % cservermon # + \
96 >                       #'monitoringlink:CentralServer monitoring,%s%s\n' % (self.centralservermon, cservermon.replace('logtype=Status&', 'logtype=Status|')) + \
97 >
98 >        fmeta.write( strmeta )
99          fmeta.close()
100  
101          common.logger.debug( "Metadatafile created as %s " % fmeta.name )

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines