Mercurial > hg-stable

changeset 12650:fed4bb2c8def

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
inotify: raise correct error if server is already started in a deep repository When path is too long to be an Unix socket address, we create a socket in a temporary directory and link from the long path to the shorter one. But checks in server code at startup were insufficient in this case, and used to raise an unclear "tried linking .hg/inotify.sock to a temporary socket but .hg/inotify.sock already exists"
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sat, 09 Oct 2010 15:41:53 +0200
parents 6c0e1aee1b19
children 17f28de168a4
files hgext/inotify/server.py tests/test-inotify-issue1208.t
diffstat 2 files changed, 16 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/inotify/server.py	Fri Oct 08 21:43:21 2010 +0200
+++ b/hgext/inotify/server.py	Sat Oct 09 15:41:53 2010 +0200
@@ -332,18 +332,21 @@
         self.repowatcher = repowatcher
         self.sock = socket.socket(socket.AF_UNIX)
         self.sockpath = join(root, '.hg/inotify.sock')
-        self.realsockpath = None
+
+        self.realsockpath = self.sockpath
+        if os.path.islink(self.sockpath):
+            if os.path.exists(self.sockpath):
+                self.realsockpath = os.readlink(self.sockpath)
+            else:
+                raise util.Abort('inotify-server: cannot start: '
+                                '.hg/inotify.sock is a broken symlink')
         try:
-            self.sock.bind(self.sockpath)
+            self.sock.bind(self.realsockpath)
         except socket.error, err:
             if err.args[0] == errno.EADDRINUSE:
                 raise AlreadyStartedException(_('cannot start: socket is '
                                                 'already bound'))
             if err.args[0] == "AF_UNIX path too long":
-                if os.path.islink(self.sockpath) and \
-                        not os.path.exists(self.sockpath):
-                    raise util.Abort('inotify-server: cannot start: '
-                                    '.hg/inotify.sock is a broken symlink')
                 tempdir = tempfile.mkdtemp(prefix="hg-inotify-")
                 self.realsockpath = os.path.join(tempdir, "inotify.sock")
                 try:
--- a/tests/test-inotify-issue1208.t	Fri Oct 08 21:43:21 2010 +0200
+++ b/tests/test-inotify-issue1208.t	Sat Oct 09 15:41:53 2010 +0200
@@ -26,4 +26,11 @@
 
   $ hg status
   ? hg.pid
+
+if we try to start twice the server, make sure we get a correct error
+
+  $ hg inserve -d --pid-file=hg2.pid
+  abort: inotify-server: cannot start: socket is already bound
+  abort: child process failed to start
+  [255]
   $ kill `cat hg.pid`