Commit a126e709 authored by Kirill Smelkov's avatar Kirill Smelkov

X wcfs: Put client log into its own logger

parent 20d05d66
...@@ -67,7 +67,7 @@ The following environment variables can be used to control wcfs.py client: ...@@ -67,7 +67,7 @@ The following environment variables can be used to control wcfs.py client:
from __future__ import print_function, absolute_import from __future__ import print_function, absolute_import
import os, sys, hashlib, subprocess, stat import os, sys, hashlib, subprocess, stat
import logging as log import logging; log = logging.getLogger('wcfs')
from os.path import dirname from os.path import dirname
from stat import S_ISDIR from stat import S_ISDIR
from errno import ENOENT, ENOTCONN, EEXIST from errno import ENOENT, ENOTCONN, EEXIST
...@@ -291,7 +291,7 @@ def _optv_with_wcfs_defaults(optv): # -> optv ...@@ -291,7 +291,7 @@ def _optv_with_wcfs_defaults(optv): # -> optv
def _start(zurl, *optv): # -> Server, fwcfs def _start(zurl, *optv): # -> Server, fwcfs
mntpt = _mntpt_4zurl(zurl) mntpt = _mntpt_4zurl(zurl)
optv = _optv_with_wcfs_defaults(optv) optv = _optv_with_wcfs_defaults(optv)
log.info("wcfs: starting for %s ...", zurl) log.info("starting for %s ...", zurl)
# XXX errctx "wcfs: start" # XXX errctx "wcfs: start"
...@@ -332,7 +332,7 @@ def _start(zurl, *optv): # -> Server, fwcfs ...@@ -332,7 +332,7 @@ def _start(zurl, *optv): # -> Server, fwcfs
wg.go(_) wg.go(_)
wg.wait() wg.wait()
log.info("wcfs: started pid%d @ %s", wcsrv._proc.pid, mntpt) log.info("started pid%d @ %s", wcsrv._proc.pid, mntpt)
fwcfs = wcsrv._fwcfs fwcfs = wcsrv._fwcfs
del wcsrv._fwcfs del wcsrv._fwcfs
...@@ -398,7 +398,7 @@ def _stop(wcsrv, ctx, _onstuck=None): ...@@ -398,7 +398,7 @@ def _stop(wcsrv, ctx, _onstuck=None):
@func(Server) @func(Server)
def __stop(wcsrv, ctx, _onstuck): def __stop(wcsrv, ctx, _onstuck):
log.info("wcfs: unmount/stop wcfs pid%d @ %s", wcsrv._proc.pid, wcsrv.mountpoint) log.info("unmount/stop wcfs pid%d @ %s", wcsrv._proc.pid, wcsrv.mountpoint)
deadline = ctx.deadline() deadline = ctx.deadline()
if deadline is None: if deadline is None:
...@@ -658,7 +658,7 @@ def _ready(ch): ...@@ -658,7 +658,7 @@ def _ready(ch):
def serve(zurl, optv, exec_=False, _tstartingq=None): def serve(zurl, optv, exec_=False, _tstartingq=None):
mntpt = _mntpt_4zurl(zurl) mntpt = _mntpt_4zurl(zurl)
optv = _optv_with_wcfs_defaults(optv) optv = _optv_with_wcfs_defaults(optv)
log.info("wcfs: serving %s ...", zurl) log.info("serving %s ...", zurl)
# try opening .wcfs - it is an error if we can do it. # try opening .wcfs - it is an error if we can do it.
fwcfs, trylockstartf = _try_attach_wcsrv(mntpt) fwcfs, trylockstartf = _try_attach_wcsrv(mntpt)
......
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