Merge branch 'dev' for v1.3

.gitignore

@@ -14,5 +14,3 @@ plugins/signatures.json
 user_data/
 customPlugins/
 cache/
-build/
-dist/

requirements.txt

@@ -9,4 +9,3 @@ requests-doh
 Flask-QRcode
 PySocks
 python-git-info
-waitress

server.py

@@ -1,15 +1,11 @@
-import os
-import sys
-import platform
+from flask import Flask
 from main import app
-from waitress import serve
+import main
+from gunicorn.app.base import BaseApplication
+import os
 
 
-threads = 4
-
-def gunicornServer():
-    from gunicorn.app.base import BaseApplication
-    class GunicornApp(BaseApplication):
+class GunicornApp(BaseApplication):
     def __init__(self, app, options=None):
         self.options = options or {}
         self.application = app
@@ -22,31 +18,21 @@ def gunicornServer():
 
     def load(self):
         return self.application
+
+if __name__ == '__main__':
+    workers = 1
+    threads = 2
+    if workers is None:
+        workers = 1
+    if threads is None:
+        threads = 2
+    workers = int(workers)
+    threads = int(threads)
     options = {
         'bind': '0.0.0.0:5000',
-        'workers': 2,
+        'workers': workers,
         'threads': threads,
     }
     gunicorn_app = GunicornApp(app, options)
-    print(f'Starting server with Gunicorn on {platform.system()} with {threads} threads...', flush=True)
+    print('Starting server with ' + str(workers) + ' workers and ' + str(threads) + ' threads', flush=True)
     gunicorn_app.run()
-    
-
-if __name__ == '__main__':    
-    # Check if --gunicorn is in the command line arguments
-    if "--gunicorn" in sys.argv:
-        gunicornServer()
-        sys.exit()
-
-    print(f'Starting server with Waitress on {platform.system()} with {threads} threads...', flush=True)
-    print(f'Press Ctrl+C to stop the server', flush=True)
-    print(f'Serving on http://0.0.0.0:5000/', flush=True)
-    serve(app, host="0.0.0.0", port=5000, threads=threads)
-
-
-
-
-
-
-
-