From b9e7ca6b83b2aea5f59139b97b7cbc8b17186e36 Mon Sep 17 00:00:00 2001 From: Antoine Millet Date: Mon, 7 Mar 2011 11:28:24 +0100 Subject: [PATCH] Added error handling for unknown objects. --- ccserver/exceptions.py | 3 +++ ccserver/objectsdb.py | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ccserver/exceptions.py b/ccserver/exceptions.py index efdf163..565b072 100644 --- a/ccserver/exceptions.py +++ b/ccserver/exceptions.py @@ -35,3 +35,6 @@ class BadJobTypeError(Exception): class UnknownJobError(Exception): pass + +class UnknownObjectError(Exception): + pass diff --git a/ccserver/objectsdb.py b/ccserver/objectsdb.py index 7338070..efab3f7 100644 --- a/ccserver/objectsdb.py +++ b/ccserver/objectsdb.py @@ -13,7 +13,7 @@ from threading import RLock from ccserver.tql import TqlObject from ccserver.orderedset import OrderedSet -from ccserver.exceptions import AlreadyRegistered +from ccserver.exceptions import AlreadyRegistered, UnknownObjectError DEFAULT_TTL = 0 TTL_SERVER_DELTA = 1 # Delta to apply for all tags @@ -107,7 +107,8 @@ class ObjectsDB(object): oid = ids.pop() obj = self._objects.get(oid) - assert obj is not None, 'object not found' + if obj is None: + raise UnknownObjectError('%r not found in database' % oid) if '__parent' in obj: # Current object is proxified by a parent: -- GitLab