Commit 791ea4a9 authored by Andreas Jung's avatar Andreas Jung

fix

parent ba1b66f8
...@@ -435,10 +435,9 @@ class TransientObjectContainer(SimpleItem): ...@@ -435,10 +435,9 @@ class TransientObjectContainer(SimpleItem):
length = self._length() # XXX ReadConflictError hotspot length = self._length() # XXX ReadConflictError hotspot
if self._limit and length >= self._limit: if self._limit and length >= self._limit:
LOG('Transience', WARNING, LOG.warn('Transient object container %s max subobjects '
('Transient object container %s max subobjects '
'reached' % self.getId()) 'reached' % self.getId())
)
raise MaxTransientObjectsExceeded, ( raise MaxTransientObjectsExceeded, (
"%s exceeds maximum number of subobjects %s" % "%s exceeds maximum number of subobjects %s" %
(length, self._limit)) (length, self._limit))
...@@ -797,11 +796,8 @@ class TransientObjectContainer(SimpleItem): ...@@ -797,11 +796,8 @@ class TransientObjectContainer(SimpleItem):
except (KeyError, AttributeError): except (KeyError, AttributeError):
path = self.getPhysicalPath() path = self.getPhysicalPath()
err = 'No such onAdd/onDelete method %s referenced via %s' err = 'No such onAdd/onDelete method %s referenced via %s'
LOG('Transience', LOG.warn(err % (callback, '/'.join(path)),
WARNING, exc_info=sys.exc_info())
err % (callback, '/'.join(path)),
error=sys.exc_info()
)
return return
else: else:
method = callback method = callback
...@@ -818,22 +814,16 @@ class TransientObjectContainer(SimpleItem): ...@@ -818,22 +814,16 @@ class TransientObjectContainer(SimpleItem):
except: except:
# dont raise, just log # dont raise, just log
path = self.getPhysicalPath() path = self.getPhysicalPath()
LOG('Transience', LOG.warn('%s failed when calling %s in %s' % (name,callback,
WARNING,
'%s failed when calling %s in %s' % (name,callback,
'/'.join(path)), '/'.join(path)),
error=sys.exc_info() exc_info=sys.exc_info())
)
finally: finally:
setSecurityManager(sm) setSecurityManager(sm)
else: else:
err = '%s in %s attempted to call non-callable %s' err = '%s in %s attempted to call non-callable %s'
path = self.getPhysicalPath() path = self.getPhysicalPath()
LOG('Transience', LOG.warn(err % (name, '/'.join(path), callback),
WARNING, exc_info=sys.exc_info())
err % (name, '/'.join(path), callback),
error=sys.exc_info()
)
def getId(self): def getId(self):
return self.id return self.id
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment