Merge branch 'v2_1_14Version'

castor/scheduler/connectionpool.py

@@ -46,7 +46,7 @@ def asyncreq(proxy, handler, *args):
     return connection.async_request(handler, oid, *args)
 
 # initialization of the log messages
-msgs = dlf.enum('CONNLOST')
+msgs = dlf.enum('CONNLOST', base=1000)
 dlf.addmessages({msgs.CONNLOST : 'Connection lost'})
 
 class ConnectionPool(object):

castor/scheduler/transfermanager/transfermanagerdlf.py

@@ -121,7 +121,7 @@ dlf.addmessages({msgs.ABORTEREXCEPTION : 'Caught exception in Aborter thread',
                  msgs.D2DDESTRESTARTERROR : 'Unable to put d2ddest back in queue as sources are missing. Probable race condition',
                  msgs.INVOKINGTRANSFERBACKTOQUEUE : 'Invoking transferBackToQueue',
                  msgs.TRANSFERSRCCANCELED : 'denying start of source transfer as it has been canceled',
-                 msgs.REPORTMANAGEREXCEPTION : 'Caught exception in Aborter thread',
+                 msgs.REPORTMANAGEREXCEPTION : 'Caught exception in Reporter thread',
                  msgs.INVOKINGMODIFYDISKSERVERS : 'Invoking modifyDiskServers',
                  msgs.MODIFYDISKSERVERSEXCEPTION : 'Exception caught while modifying diskserver(s), giving up',
                  msgs.INITQUEUES : 'Initializing Queues from the diskmanagers\' ones',