Sfoglia il codice sorgente

tornado를 체리 뭐시기로 전환

잉여개발기 (SPDV) 5 anni fa
parent
commit
af967d5559
4 ha cambiato i file con 13 aggiunte e 13 eliminazioni
  1. 6 8
      app.py
  2. 1 1
      requirements.txt
  3. 5 3
      route/tool/func.py
  4. 1 1
      version.json

+ 6 - 8
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')
+    conn = sqlite3.connect(set_data['db'] + '.db', check_same_thread = False)
     curs = conn.cursor()
 
 load_conn(conn)
@@ -727,11 +727,9 @@ app.secret_key = rep_key
 app.wsgi_app = werkzeug.debug.DebuggedApplication(app.wsgi_app, True)
 app.debug = True
 
+server = WSGIServer(('0.0.0.0', 3000), PathInfoDispatcher({'/' : app}))
 if __name__ == "__main__":
-    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()
+    try:
+        server.start()
+    except KeyboardInterrupt:
+        server.stop()

+ 1 - 1
requirements.txt

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

+ 5 - 3
route/tool/func.py

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

+ 1 - 1
version.json

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