Commit 59ebcafe authored by 张鹏程's avatar 张鹏程

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	startup.py
parents 1aaf3d08 73379778
Pipeline #929 failed with stages
...@@ -38,19 +38,19 @@ def apps(): ...@@ -38,19 +38,19 @@ def apps():
if __name__ == "__main__": if __name__ == "__main__":
app = apps() #app = apps()
server = HTTPServer(app) #server = HTTPServer(app)
[i.setFormatter(LogFormatter()) for i in logging.getLogger().handlers] #[i.setFormatter(LogFormatter()) for i in logging.getLogger().handlers]
tornado.options.parse_command_line() #tornado.options.parse_command_line()
# #== 本地调试 # #== 本地调试
app.listen(20011) #app.listen(20011)
IOLoop.instance().start() #IOLoop.instance().start()
# tornado.options.parse_command_line() tornado.options.parse_command_line()
# app = apps() app = apps()
# http_server = tornado.httpserver.HTTPServer(app) http_server = tornado.httpserver.HTTPServer(app)
# http_server.bind(options.port) http_server.bind(options.port)
# http_server.start() http_server.start()
# tornado.ioloop.IOLoop.instance().start() tornado.ioloop.IOLoop.instance().start()
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment