Changeset 4af387

Timestamp:

01/18/2010 02:36:03 AM (16 years ago)

Author:

Andrew Resch <andrewresch@gmail.com>

Children:

368613

Parents:

a62fda

Message:

Fix #1128 Show an error dialog when unable to start a 'deluged' process

Files:

• ChangeLog (modified) (1 diff)
• deluge/ui/client.py (modified) (2 diffs)
• deluge/ui/gtkui/connectionmanager.py (modified) (5 diffs)

ChangeLog

@@ +1 @@
+=== Deluge 1.2.1 ===
+==== GtkUI ====
+        * Fix #1128 Show an error dialog when unable to start a 'deluged' process
+        
 === Deluge 1.2.0 - "Bursting like an infected kidney" (10 January 2010) ===
 ==== Core ====

deluge/ui/client.py

@@ -536 +536 @@
         Starts a daemon process.
 
-        :param port: int, the port for the daemon to listen on
-        :param config: str, the path to the current config folder
+        :param port: the port for the daemon to listen on
+        :type port: int
+        :param config: the path to the current config folder
+        :type config: str
         :returns: True if started, False if not
-
+        :rtype: bool
+
+        :raises OSError: received from subprocess.call()
+        
         """
         try:
@@ -548 +553 @@
             else:
                 subprocess.call(["deluged", "--port=%s" % port, "--config=%s" % config])
+        except OSError, e:
+            log.exception(e)
+            raise e
         except Exception, e:
             log.error("Unable to start daemon!")

deluge/ui/gtkui/connectionmanager.py

@@ -50 +50 @@
 from deluge.configmanager import ConfigManager
 from deluge.log import LOG as log
+import dialogs
 
 DEFAULT_HOST = "127.0.0.1"
@@ -397 +398 @@
             True)
 
+    def start_daemon(self, port, config):
+        """
+        Attempts to start a daemon process and will show an ErrorDialog if unable
+        to.
+        """
+        try:
+            return client.start_daemon(port, config)
+        except OSError, e:
+            if e.errno == 2:
+                dialogs.ErrorDialog(
+                    _("Unable to start daemon!"),
+                    _("Deluge cannot find the 'deluged' executable, it is likely \
+that you forgot to install the deluged package or it's not in your PATH.")).run()
+            else:
+                raise e
+        except Exception, e:
+            import traceback
+            import sys
+            tb = sys.exc_info()
+            dialogs.ErrorDialog(
+                _("Unable to start daemon!"),
+                _("Please examine the details for more information."),
+                details=traceback.format_exc(tb[2])).run()
+
     # Signal handlers
     def __on_connected(self, connector, host_id):
@@ -424 +449 @@
             host in ("127.0.0.1", "localhost"):
             # We need to start this localhost
-            client.start_daemon(port, deluge.configmanager.get_config_dir())
+            self.start_daemon(port, deluge.configmanager.get_config_dir())
 
             def on_connect_fail(result, try_counter):
@@ -505 +530 @@
             self.add_host(DEFAULT_HOST, DEFAULT_PORT)
             # ..and start the daemon.
-            client.start_daemon(DEFAULT_PORT, deluge.configmanager.get_config_dir())
+            self.start_daemon(DEFAULT_PORT, deluge.configmanager.get_config_dir())
             return
 
@@ -539 +564 @@
 
         elif status == _("Offline"):
-            client.start_daemon(port, deluge.configmanager.get_config_dir())
+            self.start_daemon(port, deluge.configmanager.get_config_dir())
             reactor.callLater(2.0, self.__update_list)