from sfa.util.sfaticket import SfaTicket
from sfa.util.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord
from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn
-from sfa.util.xmlrpcprotocol import ServerException
import sfa.util.xmlrpcprotocol as xmlrpcprotocol
from sfa.util.config import Config
from sfa.util.version import version_core
elif record['type'] in ["slice"]:
try:
cred = self.get_slice_cred(record.get_name()).save_to_string(save_parents=True)
- except ServerException, e:
+ except xmlrpcprotocol.ServerException, e:
# XXX smbaker -- once we have better error return codes, update this
# to do something better than a string compare
if "Permission error" in e.args[0]:
for name, value, expected in zip(max_args, args, self.accepts):
self.type_check(name, value, expected, args)
+ if self.api.config.SFA_API_DEBUG:
+ sfa_logger().debug("method.__call__ calling method %s"%methodname)
result = self.call(*args, **kwds)
- runtime = time.time() - start
+ runtime = time.time() - start
if self.api.config.SFA_API_DEBUG or hasattr(self, 'message'):
- msg=getattr(self,'message',"method %s completed in %02f s"%(methodname,runtime))
- sfa_logger().debug(msg)
+ sfa_logger().debug("method.__call__ %s completed in %02f s (%s)"%(methodname,runtime,getattr(self,'message',"[no-msg]")))
return result
# implements SFA tickets
#
-### $Id$
-### $URL$
-
import xmlrpclib
from sfa.trust.certificate import Certificate
-### $Id$
-### $URL$
-
import os
from sfa.util.rspec import RecordSpec
verbose = False
if options and options.debug:
verbose = True
- sfa_logger().info ("Connecting to xmlrpcserver at %s (with verbose=%s)"%(url,verbose))
+ sfa_logger().debug ("xmlrpcprotocol.XMLRPCServerProxy.__init__ %s (with verbose=%s)"%(url,verbose))
xmlrpclib.ServerProxy.__init__(self, url, transport, allow_none=allow_none, verbose=verbose)
def __getattr__(self, attr):
- sfa_logger().info ("Calling xml-rpc method:%s"%attr)
+ sfa_logger().debug ("xmlrpcprotocol.XMLRPCServerProxy.__getattr__ on xml-rpc method:%s"%attr)
return xmlrpclib.ServerProxy.__getattr__(self, attr)
clean::
rm -f $(HTMLS)
+
+backup:
+ $(foreach wsdl,$(WSDLS), cp $(wsdl) $(wsdl).bak;)
+ $(foreach html,$(HTMLS), cp $(html) $(html).bak;)
+
+diff:
+ $(foreach wsdl,$(WSDLS), diff $(wsdl) $(wsdl).bak;)
+ $(foreach html,$(HTMLS), diff $(html) $(html).bak;)