← Back to branch summary

~ubuntu-branches/ubuntu/trusty/nordugrid-arc/trusty-proposed

« back to all changes in this revision

Viewing changes to src/hed/acc/ARC0/JobControllerPluginARC0.cpp

  • Committer: Package Import Robot
  • Author(s): Mattias Ellert
  • Date: 2013-11-29 13:39:10 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20131129133910-altaxrfowczzl2ev
Tags: 4.0.0-1
http://bugs.debian.org/715131
https://launchpad.net/bugs/1049798
4.0.0 Release (Closes: #715131) (LP: #1049798)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/hed/acc/ARC0/JobControllerPluginARC0.cpp
236
236
      logger.msg(VERBOSE, "Cleaning job: %s", job.JobID);
237
237
  
238
238
      FTPControl ctrl;
239
 
      if (!ctrl.Connect(URL(job.JobID), usercfg.ProxyPath(), usercfg.CertificatePath(),
240
 
                        usercfg.KeyPath(), usercfg.Timeout())) {
 
239
      if (!ctrl.Connect(URL(job.JobID), usercfg)) {
241
240
        logger.msg(INFO, "Failed to connect for job cleaning");
242
241
        ok = false;
243
242
        IDsNotProcessed.push_back(job.JobID);
285
284
      logger.msg(VERBOSE, "Cancelling job: %s", job.JobID);
286
285
  
287
286
      FTPControl ctrl;
288
 
      if (!ctrl.Connect(URL(job.JobID), usercfg.ProxyPath(), usercfg.CertificatePath(),
289
 
                        usercfg.KeyPath(), usercfg.Timeout())) {
 
287
      if (!ctrl.Connect(URL(job.JobID), usercfg)) {
290
288
        logger.msg(INFO, "Failed to connect for job cancelling");
291
289
        ok = false;
292
290
        IDsNotProcessed.push_back(job.JobID);
335
333
      logger.msg(VERBOSE, "Renewing credentials for job: %s", job.JobID);
336
334
  
337
335
      FTPControl ctrl;
338
 
      if (!ctrl.Connect(URL(job.JobID), usercfg.ProxyPath(), usercfg.CertificatePath(),
339
 
                        usercfg.KeyPath(), usercfg.Timeout())) {
 
336
      if (!ctrl.Connect(URL(job.JobID), usercfg)) {
340
337
        logger.msg(INFO, "Failed to connect for credential renewal");
341
338
        ok = false;
342
339
        IDsNotProcessed.push_back(job.JobID);