contournement de problèmes
This commit is contained in:
parent
9d6243d44a
commit
34d1f5d04d
|
@ -351,8 +351,14 @@ class Application(applications.Application):
|
|||
# we have to do it before asking for the VirtualHost object
|
||||
context.setVar('cache', cache)
|
||||
context.setVar('temporaryCache', temporaryCache)
|
||||
cache.checkCachedValues()
|
||||
temporaryCache.checkCachedValues()
|
||||
try:
|
||||
cache.checkCachedValues()
|
||||
temporaryCache.checkCachedValues()
|
||||
except AssertionError:
|
||||
# [NOTAFIX] sth happens; don't know why; ignore
|
||||
# File ".../glasnost/proxy/DispatcherProxy.py", line 296, in add
|
||||
# assert self.serverAccessor == serverAccessor
|
||||
pass
|
||||
|
||||
virtualHost = None
|
||||
splitedHttpLocalPath = [x for x in httpLocalPath.split('/') if x]
|
||||
|
|
|
@ -166,10 +166,14 @@ class VirtualHost(ObjectServerMixin, VirtualHostCommon):
|
|||
objectsByHostName[self.hostName] = self
|
||||
|
||||
def releaseNonCore(self, parentSlot = None):
|
||||
if self.__dict__.has_key('customWebs'):
|
||||
del self.customWebs
|
||||
if self.__dict__.has_key('locales'):
|
||||
del self.locales
|
||||
# [NOTAFIX] disabled the four next lines since acquireNonCore/use/
|
||||
# releaseNonCore is not atomic and we would sometimes end up
|
||||
# releasing while another process is in acquire
|
||||
#
|
||||
#if self.__dict__.has_key('customWebs'):
|
||||
# del self.customWebs
|
||||
#if self.__dict__.has_key('locales'):
|
||||
# del self.locales
|
||||
ObjectServerMixin.releaseNonCore(self, parentSlot = parentSlot)
|
||||
|
||||
register(VirtualHost)
|
||||
|
|
Reference in New Issue