Merge remote-tracking branch 'origin/master'

# Conflicts:
#	startup.py

startup.py

@@ -38,19 +38,19 @@ def apps():
 
 if __name__ == "__main__":
 
-    app = apps()
-    server = HTTPServer(app)
-    [i.setFormatter(LogFormatter()) for i in logging.getLogger().handlers]
-    tornado.options.parse_command_line()
+    #app = apps()
+    #server = HTTPServer(app)
+    #[i.setFormatter(LogFormatter()) for i in logging.getLogger().handlers]
+    #tornado.options.parse_command_line()
 
     # #== 本地调试
-    app.listen(20011)
-    IOLoop.instance().start()
+    #app.listen(20011)
+    #IOLoop.instance().start()
 
 
-    # tornado.options.parse_command_line()
-    # app = apps()
-    # http_server = tornado.httpserver.HTTPServer(app)
-    # http_server.bind(options.port)
-    # http_server.start()
-    # tornado.ioloop.IOLoop.instance().start()
\ No newline at end of file
+    tornado.options.parse_command_line()
+    app = apps()
+    http_server = tornado.httpserver.HTTPServer(app)
+    http_server.bind(options.port)
+    http_server.start()
+    tornado.ioloop.IOLoop.instance().start()