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.6 by mcinquil, Tue Feb 1 14:10:44 2011 UTC vs.
Revision 1.7 by belforte, Fri Jan 11 16:01:20 2013 UTC

# Line 60 | Line 60 | class ReportUploader( Actor ):
60  
61          self.taskname = common._db.queryTask('name')
62  
63 +        self.task = common._db.getTask()
64 +
65          self.hostname = socket.getfqdn()
66  
67          self.username = getUserName()
68  
69          self.scheduler = common.scheduler.name()
70  
71 +        if (self.scheduler.upper() in 'REMOTEGLIDEIN') :
72 +            self.server_name = str(self.task['serverName'])
73 +            cmd = "gsissh %s pwd" % self.server_name
74 +            self.remote_path = runCommand(cmd).rstrip()
75 +        else :
76 +            self.remote_path=''
77 +
78          val = getCentralConfigLink('reportLogURL')
79          if val is not None and len(val) > 0:
80              self.uploadFileServer = val
# Line 89 | Line 98 | class ReportUploader( Actor ):
98                    'version:%s\n' % '%s_%s' % (common.prog_name.upper(), common.prog_version_str) + \
99                    'jobuuid:%s\n' % self.taskname + \
100                    'monitoringlink:Dashboard Task Mon,%s%s \n' %(self.dashbtaskmon,self.taskname) # + \
101 <        if self.server_name != 'No server':
101 >        if self.server_name != 'No server' and \
102 >               self.scheduler.upper() != 'REMOTEGLIDEIN' :
103              cserverStatus = 'http://%s:8888/visualog/?logtype=Status&taskname=%s\n' % (self.server_name, self.taskname)
104              strmeta += 'monitoringlink:CrabServer Status,%s\n' % cserverStatus
105              cserverLog = 'http://%s:8888/visualog/?logtype=Logging&taskname=%s\n' % (self.server_name, self.taskname)
# Line 120 | Line 130 | class ReportUploader( Actor ):
130                       'scheduler:        %s\n' % self.scheduler + \
131                       'requested server: %s\n' % self.requestedserver + \
132                       'used server:      %s\n' % self.server_name + \
133 <                     'task:             %s\n' % self.taskname
133 >                     'task:             %s\n' % self.taskname + \
134 >                     'remote path:      %s\n' % (self.remote_path+'/'+self.taskname)
135                     )
136          fsummary.close()
137  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines