From 48020105afdec7dce714c9a74e036802f111008b Mon Sep 17 00:00:00 2001 From: nOOb3167 Date: Tue, 20 Mar 2018 04:11:04 -0400 Subject: [PATCH] Schedule purging using plain python, obviating the need for APScheduler --- requirements.txt | 1 - server.py | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index ec351c6..fe14968 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -APScheduler>=3 Flask>=0.10 diff --git a/server.py b/server.py index 4008c26..cfecaf4 100755 --- a/server.py +++ b/server.py @@ -2,14 +2,9 @@ import os, re, sys, json, time, socket from threading import Thread, RLock -from apscheduler.schedulers.background import BackgroundScheduler from flask import Flask, request, send_from_directory -# Set up scheduler -sched = BackgroundScheduler(timezone="UTC") -sched.start() - app = Flask(__name__, static_url_path = "") # Load configuration @@ -396,11 +391,18 @@ class ServerList: self.sort() self.save() +class PurgeThread(Thread): + def __init__(self): + Thread.__init__(self) + self.daemon = True + def run(self): + while True: + time.sleep(60) + serverList.purgeOld() + serverList = ServerList() -sched.add_job(lambda: serverList.purgeOld(), "interval", - seconds=60, coalesce=True, max_instances=1) +PurgeThread().start() if __name__ == "__main__": app.run(host = app.config["HOST"], port = app.config["PORT"]) -