From a01cd34b5835ac824ea3bb9448d92e2e38dde360 Mon Sep 17 00:00:00 2001
From: ShyPike <shypike@sabnzbd.org>
Date: Sat, 16 Jul 2011 00:03:14 +0200
Subject: [PATCH] Fix handle leak. Caused by bug in CherryPy's memory-based
 session support. Replace by file-based. As we don't really need session
 support, disable it and make it available through the --sessions option.

---
 SABnzbd.py      | 18 ++++++++++++++++--
 sabnzbd/misc.py | 11 ++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/SABnzbd.py b/SABnzbd.py
index 93bdae4..f64efbc 100755
--- a/SABnzbd.py
+++ b/SABnzbd.py
@@ -769,7 +769,7 @@ def commandline_handler(frozen=True):
                                     'weblogging=', 'server=', 'templates',
                                     'template2', 'browser=', 'config-file=', 'force',
                                     'version', 'https=', 'autorestarted', 'repair', 'repair-all',
-                                    'log-all', 'no-login', 'pid=', 'new',
+                                    'log-all', 'no-login', 'pid=', 'new', 'sessions',
                                     # Below Win32 Service options
                                     'password=', 'username=', 'startup=', 'perfmonini=', 'perfmondll=',
                                     'interactive', 'wait=',
@@ -842,6 +842,7 @@ def main():
     re_argv = [sys.argv[0]]
     pid_path = None
     new_instance = False
+    force_sessions = False
 
     service, sab_opts, serv_opts, upload_nzbs = commandline_handler()
 
@@ -922,6 +923,8 @@ def main():
             re_argv.append(arg)
         elif opt in ('--new',):
             new_instance = True
+        elif opt in ('--sessions',):
+            force_sessions = True
 
     sabnzbd.MY_FULLNAME = os.path.normpath(os.path.abspath(sabnzbd.MY_FULLNAME))
     sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME)
@@ -1294,6 +1297,14 @@ def main():
         sabnzbd.cfg.username.set('')
         sabnzbd.cfg.password.set('')
 
+    # Fix leakage in memory-based CherryPy session support by using file-based.
+    # However, we don't really need session support.
+    if force_sessions:
+        sessions = sabnzbd.misc.create_real_path('sessions', sabnzbd.cfg.admin_dir.get_path(), 'sessions')[1]
+        sabnzbd.misc.remove_all(sessions, 'session-*.lock', keep_folder=True)
+    else:
+        sessions = None
+
     cherrypy.config.update({'server.environment': 'production',
                             'server.socket_host': cherryhost,
                             'server.socket_port': cherryport,
@@ -1303,7 +1314,10 @@ def main():
                             'engine.reexec_retry' : 100,
                             'tools.encode.on' : True,
                             'tools.gzip.on' : True,
-                            'tools.sessions.on' : True,
+                            'tools.sessions.on' : bool(sessions),
+                            'tools.sessions.storage_type' : 'file',
+                            'tools.sessions.storage_path' : sessions,
+                            'tools.sessions.timeout' : 60,
                             'request.show_tracebacks': True,
                             'checker.check_localhost' : bool(consoleLogging),
                             'error_page.401': sabnzbd.panic.error_page_401
diff --git a/sabnzbd/misc.py b/sabnzbd/misc.py
index 1596113..c3046cf 100644
--- a/sabnzbd/misc.py
+++ b/sabnzbd/misc.py
@@ -1138,16 +1138,17 @@ def remove_dir(path):
         os.rmdir(path)
 
 
-def remove_all(path, pattern='*'):
+def remove_all(path, pattern='*', keep_folder=False):
     """ Remove folder and all its content
     """
     if os.path.exists(path):
         for f in globber(path, pattern):
             os.remove(f)
-        try:
-            os.rmdir(path)
-        except:
-            pass
+        if not keep_folder:
+            try:
+                os.rmdir(path)
+            except:
+                pass
 
 
 def clean_folder(path, pattern='*'):