move xmlrpc marshaller into lib and use i8 for large ints
This commit is contained in:
parent
448924e2c6
commit
ab48fa80b2
5 changed files with 54 additions and 57 deletions
|
|
@ -34,7 +34,6 @@ import time
|
|||
import sys
|
||||
import traceback
|
||||
import errno
|
||||
import xmlrpclib
|
||||
|
||||
|
||||
def incremental_upload(session, fname, fd, path, retries=5, logger=None):
|
||||
|
|
@ -1209,12 +1208,12 @@ class TaskManager(object):
|
|||
try:
|
||||
response = (handler.run(),)
|
||||
# note that we wrap response in a singleton tuple
|
||||
response = xmlrpclib.dumps(response, methodresponse=1, allow_none=1)
|
||||
response = koji.dumps(response, methodresponse=1, allow_none=1)
|
||||
self.logger.info("RESPONSE: %r" % response)
|
||||
self.session.host.closeTask(handler.id, response)
|
||||
return
|
||||
except xmlrpclib.Fault, fault:
|
||||
response = xmlrpclib.dumps(fault)
|
||||
except koji.Fault, fault:
|
||||
response = koji.dumps(fault)
|
||||
tb = ''.join(traceback.format_exception(*sys.exc_info())).replace(r"\n", "\n")
|
||||
self.logger.warn("FAULT:\n%s" % tb)
|
||||
except (SystemExit, koji.tasks.ServerExit, KeyboardInterrupt):
|
||||
|
|
@ -1233,7 +1232,7 @@ class TaskManager(object):
|
|||
if issubclass(e_class, koji.GenericError):
|
||||
#just pass it through
|
||||
tb = str(e)
|
||||
response = xmlrpclib.dumps(xmlrpclib.Fault(faultCode, tb))
|
||||
response = koji.dumps(koji.Fault(faultCode, tb))
|
||||
|
||||
# if we get here, then we're handling an exception, so fail the task
|
||||
self.session.host.failTask(handler.id, response)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue