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.8 by belforte, Thu Sep 12 12:50:51 2013 UTC

# Line 26 | Line 26 | class ReportUploader( Actor ):
26          self.cfg_params = cfg_params
27  
28          try:
29 <            CliServerParams(self)
29 >            if common.scheduler.name().upper() != 'REMOTEGLIDEIN':
30 >                CliServerParams(self)
31              self.requestedserver = 'default'
32 <            if self.cfg_params.has_key("server_name"):
33 <                self.requestedserver = self.cfg_params['server_name']
32 >            if self.cfg_params.has_key("CRAB.server_name"):
33 >                self.requestedserver = self.cfg_params['CRAB.server_name']
34 >            if self.cfg_params.has_key("CRAB.use_server"):
35 >                if int(self.cfg_params['CRAB.use_server']) == 0:
36 >                    self.server_name = 'No server'
37          except Exception, ex:
38              common.logger.debug("Problem '%s'" % str(ex))
39 +            import traceback
40 +            common.logger.debug(str(traceback.format_exc()))
41              self.server_name = 'No server'
42              self.requestedserver = 'No server'
43  
38            
44          self.taskpath = common.work_space.topDir()
45  
46          if os.path.exists( self.taskpath ) is True:
# Line 56 | Line 61 | class ReportUploader( Actor ):
61  
62          self.taskname = common._db.queryTask('name')
63  
64 +        self.task = common._db.getTask()
65 +
66          self.hostname = socket.getfqdn()
67  
68          self.username = getUserName()
69  
70          self.scheduler = common.scheduler.name()
71  
72 +        if (self.scheduler.upper() in 'REMOTEGLIDEIN') :
73 +            self.server_name = str(self.task['serverName'])
74 +            cmd = "gsissh %s pwd" % self.server_name
75 +            self.remote_path = runCommand(cmd).rstrip()
76 +        else :
77 +            self.remote_path=''
78 +
79          val = getCentralConfigLink('reportLogURL')
80          if val is not None and len(val) > 0:
81              self.uploadFileServer = val
# Line 72 | Line 86 | class ReportUploader( Actor ):
86              self.dashbtaskmon = val
87          common.logger.debug('Using %s as link for dashboard task monitoring' % self.dashbtaskmon )
88  
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
89  
90      def __prepareMetadata( self, datafile ):
91          """
# Line 89 | Line 98 | class ReportUploader( Actor ):
98          strmeta = 'username:%s\n' % self.username + \
99                    'version:%s\n' % '%s_%s' % (common.prog_name.upper(), common.prog_version_str) + \
100                    'jobuuid:%s\n' % self.taskname + \
101 <                  'monitoringlink:Dashboard monitoring,%s%s \n' %(self.dashbtaskmon,self.taskname) # + \
102 <        if self.server_name != 'No server':
103 <            cservermon = 'http://%s:8888/visualog/?logtype=Status&taskname=%s\n' % (self.server_name, self.taskname)
104 <            strmeta += 'monitoringlink:CrabServer monitoring,%s\n' % cservermon # + \
105 <                       #'monitoringlink:CentralServer monitoring,%s%s\n' % (self.centralservermon, cservermon.replace('logtype=Status&', 'logtype=Status|')) + \
101 >                  'monitoringlink:Dashboard Task Mon,%s%s \n' %(self.dashbtaskmon,self.taskname) # + \
102 >        if self.server_name != 'No server' and \
103 >               self.scheduler.upper() != 'REMOTEGLIDEIN' :
104 >            cserverStatus = 'http://%s:8888/visualog/?logtype=Status&taskname=%s\n' % (self.server_name, self.taskname)
105 >            strmeta += 'monitoringlink:CrabServer Status,%s\n' % cserverStatus
106 >            cserverLog = 'http://%s:8888/visualog/?logtype=Logging&taskname=%s\n' % (self.server_name, self.taskname)
107 >            strmeta += 'monitoringlink:CrabServer Logging,%s\n' % cserverLog
108  
109          fmeta.write( strmeta )
110          fmeta.close()
# Line 120 | Line 131 | class ReportUploader( Actor ):
131                       'scheduler:        %s\n' % self.scheduler + \
132                       'requested server: %s\n' % self.requestedserver + \
133                       'used server:      %s\n' % self.server_name + \
134 <                     'task:             %s\n' % self.taskname
134 >                     'task:             %s\n' % self.taskname + \
135 >                     'remote path:      %s\n' % (self.remote_path+'/'+self.taskname)
136                     )
137          fsummary.close()
138  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines