.

wcfs/__init__.py

@@ -157,9 +157,7 @@ def _default_autostart():
 #
 # If shared is True - a shared connection is returned - one that will be also
 # returned for following join(shared=True) requests with the same zurl.
-#
-# join(zurl) -> Conn.
-def join(zurl, autostart=_default_autostart(), shared=False):
+def join(zurl, autostart=_default_autostart(), shared=False):   # -> Conn
     # XXX implement shared
 
     mntpt = _mntpt_4zurl(zurl)
@@ -184,17 +182,11 @@ def join(zurl, autostart=_default_autostart(), shared=False):
     optv_extra = os.environ.get("WENDELIN_CORE_WCFS_OPTIONS", "").split()
     return _start(zurl, "-autoexit", *optv_extra)
 
-    #return _start(zurl, "-autoexit", '-d', '-alsologtostderr', '-v=1')
-    #return _start(zurl, "-autoexit", '-d', '-alsologtostderr', '-v=1')
-    #return _start(zurl, "-autoexit", '-alsologtostderr')
-
 
 # _start starts wcfs server for ZODB @ zurl.
 #
 # optv can be optionally given to pass flags to wcfs.
-#
-# _start(zurl, *optv) -> Conn
-def _start(zurl, *optv):
+def _start(zurl, *optv):    # -> Conn
     mntpt = _mntpt_4zurl(zurl)
     log.info("wcfs: starting for %s ...", zurl)
 
@@ -307,7 +299,6 @@ def _start(zurl, *optv):
 
 
 
-
 # _wcfs_exe returns path to wcfs executable.
 def _wcfs_exe():
     return '%s/wcfs' % dirname(__file__)

wcfs/wcfs.go

@@ -692,19 +692,8 @@ func traceZWatch(format string, argv ...interface{}) {
 // zwatcher watches for ZODB changes.
 //
 // see "4) when we receive an invalidation message from ZODB ..."
-/*
-func (root *Root) zwatcher(ctx context.Context, zwatchq chan zodb.Event) {
-	err := root._zwatcher(ctx, zwatchq)
-	if err != nil {
-		panic(err)	// XXX -> wg.Wait in main
-	}
-}
-*/
-
 func (root *Root) zwatcher(ctx context.Context, zwatchq chan zodb.Event) (err error) {
 	defer xerr.Contextf(&err, "zwatch %s", root.zstor.URL())	// XXX err ctx recheck
-	// XXX error   -> always EIO for data operations
-	// XXX unmount -> stop
 	traceZWatch(">>>")
 
 	var zevent zodb.Event