Changeset 2022

Timestamp:

01/15/09 22:29:30 (1 year ago)

Author:

shypike

Message:

Detect lack of permission to use the web-server port and report accordingly.
On Linux systems the ports below 1024 are restricted to admins.
Closes #98 for trunk.

Files:

• trunk/main/SABnzbd.py (modified) (3 diffs)
• trunk/main/sabnzbd/misc.py (modified) (4 diffs)

trunk/main/SABnzbd.py

@@ -63 +63 @@
-from sabnzbd.misc import Get_User_ShellFolders, launch_a_browser, from_units, \
-                         check_latest_version, Panic_Templ, Panic_Port, Panic_FWall, Panic, ExitSab, \
-
+Panic_XPort, 
-import sabnzbd.scheduler as scheduler
-import sabnzbd.config as config
@@ -212 +212 @@
-
-#------------------------------------------------------------------------------
-
+, access=False
-    """Abort program because of CherryPy troubles
-    """
-    logging.error("Failed to start web-interface")
-
+
+
+
+
-    sabnzbd.halt()
-    ExitSab(2)
@@ -833 +836 @@
-        else:
-            Bail_Out(browserhost, cherryport)
+    except socket.error, error:
+        Bail_Out(browserhost, cherryport, access=True)
-    except:
-        Bail_Out(browserhost, cherryport)

trunk/main/sabnzbd/misc.py

@@ -56 +56 @@
-PANIC_FWALL = 4
-PANIC_OTHER = 5
+PANIC_XPORT = 6
-
-def Lower(txt):
@@ -336 +337 @@
-'''
-
+MSG_ILL_PORT = r'''
+    SABnzbd needs a free tcp/ip port for its internal web server.<br>
+    Port %s on %s was tried , but the account SABnzbd has no permission to use it.<br>
+    On Linux systems, normal users must use ports above 1023.<br>
+    <br>
+    Please restart SABnzbd with a different port number.<br>
+    <br>
+    %s<br>
+      &nbsp;&nbsp;&nbsp;&nbsp;%s --server %s:%s<br>
+    <br>
+    If you get this error message again, please try a different number.<br>
+'''
+
-MSG_BAD_QUEUE = r'''
-    SABnzbd detected saved data from an other SABnzbd version<br>
@@ -378 +392 @@
-        newport = "%s" % newport
-        msg = MSG_BAD_PORT % (b, a, os_str, prog_path, a, newport)
+    elif panic == PANIC_XPORT:
+        if int(b) < 1023:
+            newport = 1024
+        else:
+            newport = int(b) + 1
+        newport = "%s" % newport
+        msg = MSG_ILL_PORT % (b, a, os_str, prog_path, a, newport)
-    elif panic == PANIC_TEMPL:
-        msg = MSG_BAD_TEMPL % a
@@ -404 +425 @@
-def Panic_Port(host, port):
-    launch_a_browser(panic_message(PANIC_PORT, host, port))
+
+def Panic_XPort(host, port):
+    launch_a_browser(panic_message(PANIC_XPORT, host, port))
+    logging.error('You have no permisson to use port %s', port)
-
-def Panic_Queue(name):