Commit 054f8fa6 by rfkelly0

better process-killing in expose.fuse

parent 30d34d59
...@@ -405,7 +405,13 @@ class MountProcess(subprocess.Popen): ...@@ -405,7 +405,13 @@ class MountProcess(subprocess.Popen):
def unmount(self): def unmount(self):
"""Cleanly unmount the FUSE filesystem, terminating this subprocess.""" """Cleanly unmount the FUSE filesystem, terminating this subprocess."""
self.terminate() self.terminate()
tmr = threading.Timer(self.unmount_timeout,self.kill) def killme():
self.kill()
try:
unmount(self.path)
except OSError:
pass
tmr = threading.Timer(self.unmount_timeout,killme)
tmr.start() tmr.start()
self.wait() self.wait()
tmr.cancel() tmr.cancel()
......
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