Changeset 7bd87d

Timestamp:

11/19/2013 10:43:01 PM (11 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Children:

a3806b

Parents:

8bf18d6

git-author:

Calum Lind <calumlind+deluge@gmail.com> (11/19/2013 10:11:15 PM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (11/19/2013 10:43:01 PM)

Message:

Fix #2335 : IPC lockfile issue preventing start of deluge-gtk

File:

• deluge/ui/gtkui/ipcinterface.py (modified) (2 diffs)

deluge/ui/gtkui/ipcinterface.py

@@ -126 +126 @@
             lockfile = socket + ".lock"
             log.debug("Checking if lockfile exists: %s", lockfile)
-            if os.path.lexists(lockfile):
+            if os.path.lexists(lockfile) or os.path.lexists(socket):
                 try:
                     os.kill(int(os.readlink(lockfile)), 0)
@@ -133 +133 @@
                     try:
                         os.remove(lockfile)
+                    except OSError, ex:
+                        log.error("Failed to delete IPC lockfile file: %s", ex)
+                    try:
                         os.remove(socket)
-                    except Exception, e:
-                        log.error("Problem deleting lockfile or socket file!")
-                        log.exception(e)
+                    except OSError, ex:
+                        log.error("Failed to delete IPC socket file: %s", ex)
             try:
                 self.factory = Factory()