Commit e2f5a9f7 authored by Shane Hathaway's avatar Shane Hathaway

slog(), called when a routine error happens in store(), had a NameError on

self, which effectively turned the error into a fatal error.  Fixed.
parent a0c4e4f6
...@@ -53,7 +53,7 @@ def log(message, level=zLOG.INFO, label="ZEO Server:%s" % os.getpid(), ...@@ -53,7 +53,7 @@ def log(message, level=zLOG.INFO, label="ZEO Server:%s" % os.getpid(),
def slog(storage, msg, level=zLOG.INFO, error=None, pid=os.getpid()): def slog(storage, msg, level=zLOG.INFO, error=None, pid=os.getpid()):
name = getattr(storage, '__name__', None) name = getattr(storage, '__name__', None)
if name is None: if name is None:
name = str(self.storage) name = str(storage)
zLOG.LOG("ZEO Server:%s:%s" % (pid, name), level, msg, error=error) zLOG.LOG("ZEO Server:%s:%s" % (pid, name), level, msg, error=error)
class StorageServerError(StorageError): class StorageServerError(StorageError):
......
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