Bläddra i källkod

그냥 없던 걸로 하자

잉여개발기 (SPDV) 5 år sedan
förälder
incheckning
48415c695c
4 ändrade filer med 13 tillägg och 13 borttagningar
  1. 8 6
      app.py
  2. 1 1
      requirements.txt
  3. 3 5
      route/tool/func.py
  4. 1 1
      version.json

+ 8 - 6
app.py

@@ -118,7 +118,7 @@ if set_data['db_type'] == 'mysql':
 
     curs.execute(db_change('use ?')%pymysql.escape_string(set_data['db']))
 else:
-    conn = sqlite3.connect(set_data['db'] + '.db', check_same_thread = False)
+    conn = sqlite3.connect(set_data['db'] + '.db')
     curs = conn.cursor()
 
 load_conn(conn)
@@ -727,9 +727,11 @@ app.secret_key = rep_key
 app.wsgi_app = werkzeug.debug.DebuggedApplication(app.wsgi_app, True)
 app.debug = True
 
-server = WSGIServer((server_set['host'], int(server_set['port'])), PathInfoDispatcher({'/' : app}))
 if __name__ == "__main__":
-    try:
-        server.start()
-    except KeyboardInterrupt:
-        server.stop()
+    if sys.platform == 'win32' and sys.version_info[0:2] >= (3, 8):
+        asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+
+    http_server = tornado.httpserver.HTTPServer(tornado.wsgi.WSGIContainer(app))
+    http_server.listen(int(server_set['port']), address = server_set['host'])
+
+    tornado.ioloop.IOLoop.instance().start()

+ 1 - 1
requirements.txt

@@ -1,4 +1,4 @@
-cherrypy
+tornado
 flask
 flask-Reggie
 requests

+ 3 - 5
route/tool/func.py

@@ -8,11 +8,9 @@ for i in range(0, 2):
         import werkzeug.routing
         import werkzeug.debug
         import flask_reggie
-        try:
-            from cheroot.wsgi import Server as WSGIServer, PathInfoDispatcher
-        except ImportError:
-            from cherrypy.wsgiserver import CherryPyWSGIServer as WSGIServer, WSGIPathInfoDispatcher as PathInfoDispatcher
-            
+        import tornado.ioloop
+        import tornado.httpserver
+        import tornado.wsgi
         import urllib.request
         import email.mime.text
         import sqlite3

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.2.0-master-19",
+        "r_ver" : "v3.2.0-master-20",
         "c_ver" : "3201601",
         "s_ver" : "9"
     }, "stable" : {