Allow one to adjust interval settings without restarting.

data/interfaces/default/config.html

@@ -137,7 +137,7 @@ <h1 class="clearfix"><i class="fa fa-gear"></i> Settings</h1>
                     </tr>
                     <tr>
                         <div class="configmessage">
-                            <i class="fa fa-info-circle"></i> Web Interface changes require a restart to take effect
+                            <i class="fa fa-info-circle"></i> Web Interface changes require a restart to take effect. Saving settings will restart intervals.
                         </div>
                     </tr>
                 </table>

headphones/__init__.py

@@ -64,6 +64,7 @@
 PIDFILE = None
 
 SCHED = BackgroundScheduler()
+SCHED_LOCK = threading.Lock()
 
 INIT_LOCK = threading.Lock()
 _INITIALIZED = False
@@ -256,14 +257,25 @@ def launch_browser(host, port, root):
         logger.error('Could not launch browser: %s', e)
 
 
-def start():
+def initialize_scheduler():
+    """
+    Start the scheduled background tasks. Because this method can be called
+    multiple times, the old tasks will be first removed.
+    """
 
-    global started
+    from headphones import updater, searcher, librarysync, postprocessor, \
+        torrentfinished
 
-    if _INITIALIZED:
+    with SCHED_LOCK:
+        # Remove all jobs
+        count = len(SCHED.get_jobs())
 
-        # Start our scheduled background tasks
-        from headphones import updater, searcher, librarysync, postprocessor, torrentfinished
+        if count > 0:
+            logger.debug("Current number of background tasks: %d", count)
+            SCHED.shutdown()
+            SCHED.remove_all_jobs()
+
+        # Then add all jobs
         SCHED.add_job(updater.dbUpdate, trigger=IntervalTrigger(
             hours=CONFIG.UPDATE_DB_INTERVAL))
         SCHED.add_job(searcher.searchforalbum, trigger=IntervalTrigger(
@@ -281,11 +293,21 @@ def start():
 
         # Remove Torrent + data if Post Processed and finished Seeding
         if CONFIG.TORRENT_REMOVAL_INTERVAL > 0:
-            SCHED.add_job(torrentfinished.checkTorrentFinished, trigger=IntervalTrigger(
-                minutes=CONFIG.TORRENT_REMOVAL_INTERVAL))
+            SCHED.add_job(torrentfinished.checkTorrentFinished,
+                trigger=IntervalTrigger(
+                    minutes=CONFIG.TORRENT_REMOVAL_INTERVAL))
 
+        # Start scheduler
+        logger.info("(Re-)Scheduling background tasks")
         SCHED.start()
 
+
+def start():
+
+    global started
+
+    if _INITIALIZED:
+        initialize_scheduler()
         started = True
 
 

headphones/webserve.py

@@ -1248,7 +1248,10 @@ def configUpdate(self, **kwargs):
         # Write the config
         headphones.CONFIG.write()
 
-        #reconfigure musicbrainz database connection with the new values
+        # Reconfigure scheduler
+        headphones.initialize_scheduler()
+
+        # Reconfigure musicbrainz database connection with the new values
         mb.startmb()
 
         raise cherrypy.HTTPRedirect("config")