Changes in / [e252e5d:355b17e]


Ignore:
Location:
fedd
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • fedd/Makefile

    r8f1db21 rc092b7f  
    1414WSDL_FILES= ../wsdl/fedd.wsdl ../wsdl/fedd_types.xsd ../wsdl/fedd_internal.wsdl ../wsdl/topdl.xsd
    1515
    16 VERSION=3.21b
     16VERSION=3.20
    1717
    1818DISTFILES= dist/fedd-${VERSION}.tar.gz
  • fedd/federation/emulab_segment.py

    r3f5e375 r725c55d  
    4545        except socket_error, e:
    4646            raise service_error(service_error.connect,
    47                     "Cannot connect" % e)
     47                    "Cannot connect to %s: %s" % (url, e[1]))
    4848            raise e
    4949        except BIOError, e:
    5050            if self.log:
    51                 self.log.warn("BIO error: %s" % e)
     51                self.log.warn("BIO error contacting %s: %s" % (url, e))
    5252            raise e
    5353        except sslerror, e:
    5454            if self.log:
    55                 self.log.warn("SSL (socket) error: %s" %  e)
     55                self.log.warn("SSL (socket) error contacting %s: %s" %
     56                        (url, e))
    5657            raise e
    5758        except SSLError, e:
    5859            if self.log:
    59                 self.log.warn("SSL error: %s" % e)
     60                self.log.warn("SSL error contacting %s: %s" % (url, e))
    6061            raise e
    6162        except httplib.HTTPException, e:
    6263            if self.log:
    63                 self.log.warn("HTTP error: %s" % e)
     64                self.log.warn("HTTP error contacting %s: %s" % (url, e))
    6465            raise e
    6566        except Fault, f:
    66             raise service_error(service_error.protocol,
    67                     "Remote XMLRPC Fault: %s" % f)
     67            raise service_error(f.faultCode, f.faultString)
    6868        except Error, e:
    6969            raise service_error(service_error.protocol,
  • fedd/federation/experiment_control.py

    rd0912be r1ec5d4a  
    12471247                        "More than one project export is not supported")
    12481248
    1249         def add_services(svcs, type, slist, keys):
     1249        def add_services(svcs, type, slist):
    12501250            """
    1251             Add the given services to slist.  type is import or export.  Also
    1252             add a mapping entry from the assigned id to the original service
    1253             record.
     1251            Add the given services to slist.  type is import or export.
    12541252            """
    12551253            for i, s in enumerate(svcs):
    12561254                idx = '%s%d' % (type, i)
    1257                 keys[idx] = s
    12581255                sr = {'id': idx, 'name': s.name, 'visibility': type }
    12591256                if s.params:
     
    12971294        if import_svcs or export_svcs:
    12981295            slist = []
    1299             add_services(import_svcs, 'import', slist, e_keys)
    1300             add_services(export_svcs, 'export', slist, e_keys)
     1296            add_services(import_svcs, 'import', slist)
     1297            add_services(export_svcs, 'export', slist)
    13011298            req['service'] = slist
    13021299
  • fedd/federation/thread_pool.py

    r42dedbd re83f2f2  
    33import logging
    44import time
    5 import sys
    6 import traceback
    7 
    85from threading import Lock, Thread, Condition
    96from service_error import service_error
  • fedd/setup.py

    r37ecf7e r2e46f35  
    44
    55setup(name='fedd',
    6         version='3.21b',
     6        version='3.20',
    77        description='DETER Federation daemon',
    88        author='Ted Faber',
Note: See TracChangeset for help on using the changeset viewer.