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

Comparing COMP/CRAB/python/CredentialRenew.py (file contents):
Revision 1.1 by spiga, Mon Dec 8 21:05:26 2008 UTC vs.
Revision 1.3 by spiga, Mon Dec 8 21:47:47 2008 UTC

# Line 1 | Line 1
1   from Actor import *
2   from crab_util import *
3   import common
4 + import traceback
5   from ProdCommon.Credential.CredentialAPI import CredentialAPI
6 + from SubmitterServer import SubmitterServer
7 +
8  
9   class CredentialRenew(Actor):
10  
11      def __init__(self, cfg_params):
12 <
12 >        self.cfg_params=cfg_params
13          self.credentialType = 'Proxy'
14          if common.scheduler.name().upper() in ['LSF', 'CAF']:
15              self.credentialType = 'Token'
16 +        
17 +        # init client server params...
18 +        CliServerParams(self)      
19  
20      def run(self):
21          """
22          """
23          common.logger.debug(5, "CredentialRenew::run() called")
24 <        self.renewer()    
24 >        ## TEMPORARY FIXME  
25 >        if self.credentialType == 'Proxy':
26 >            subServer = SubmitterServer(self.cfg_params, None, "all")
27 >            subServer.moveProxy()
28 >        else:
29 >            self.renewer()    
30          common.logger.message("Credential successfully delegated to the server.\n")
31          return
32  
# Line 42 | Line 53 | class CredentialRenew(Actor):
53             except Exception, ex:
54                 raise CrabException(str(ex))
55          try:
56 <            dict = CredAPI.registerCredential(sub)
56 >            dict = CredAPI.registerCredential()
57          except Exception, err:
58              common.logger.debug(3, "Registering Credentials : " +str(traceback.format_exc()))
59              raise CrabException("ERROR: Unable to register %s delegating server: %s\n"%(self.credentialType,self.server_name ))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines