Commit 06d53bff authored by Guido van Rossum's avatar Guido van Rossum

Move the set_label() call to before the first log message. Remove the

(now redundant) pid=%s part from that first log message.
parent b65ac5ca
...@@ -61,18 +61,18 @@ class StorageServer: ...@@ -61,18 +61,18 @@ class StorageServer:
def __init__(self, addr, storages, read_only=0): def __init__(self, addr, storages, read_only=0):
self.addr = addr self.addr = addr
self.storages = storages self.storages = storages
set_label()
msg = ", ".join( msg = ", ".join(
["%s:%s" % (name, storage.isReadOnly() and "RO" or "RW") ["%s:%s" % (name, storage.isReadOnly() and "RO" or "RW")
for name, storage in storages.items()]) for name, storage in storages.items()])
log("StorageServer (pid=%d) created %s with storages: %s" % log("StorageServer created %s with storages: %s" %
(os.getpid(), read_only and "RO" or "RW", msg)) (read_only and "RO" or "RW", msg))
for s in storages.values(): for s in storages.values():
s._waiting = [] s._waiting = []
self.read_only = read_only self.read_only = read_only
self.connections = {} self.connections = {}
self.dispatcher = Dispatcher(addr, factory=self.new_connection, self.dispatcher = Dispatcher(addr, factory=self.new_connection,
reuse_addr=1) reuse_addr=1)
set_label()
def new_connection(self, sock, addr): def new_connection(self, sock, addr):
c = ManagedServerConnection(sock, addr, ZEOStorage(self), self) c = ManagedServerConnection(sock, addr, ZEOStorage(self), self)
......
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