--- a/hgext/chgserver.py	Sat May 21 17:06:39 2016 +0900
+++ b/hgext/chgserver.py	Sun May 22 11:21:11 2016 +0900
@@ -651,11 +651,8 @@
         os.symlink(os.path.basename(self.address), tempaddress)
         util.rename(tempaddress, self.baseaddress)
 
-    def run(self):
-        try:
-            self.server.serve_forever()
-        finally:
-            self.server.unlinksocketfile()
+    def _cleanup(self):
+        self.server.unlinksocketfile()
 
 def uisetup(ui):
     commandserver._servicemap['chgunix'] = chgunixservice