format code

rfyiamcool · Nov 10, 2015 · bea09f7 · bea09f7
1 parent d3e5fc3
commit bea09f7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 swift_rpc是用tornado实现的rpc服务,现在开放了四个调度接口:  
 
+(更多的关于swift的开发信息)[http://xiaorui.cc]
+
 1. register 普通接口调用模式,最纯粹最简单  
 2. register_async 借助于tornado gen.coroutine实现的非堵塞调用  
 3. register_pool  借助于futures.ThreadPoolExecutor实现线程池  
@@ -16,8 +18,8 @@ Version: 2.2
 1. rq enqueue塞入任务队列时的一个bug,已经绕过解决
 
 Future:  
-1. 使用rsa保证rpc通信安全
-2. swift_rpc完善RQ异步任务队列
+1. 使用rsa保证rpc通信安全  
+2. swift_rpc完善RQ异步任务队列  
 
 Tornado RPC Server Usage:
 

diff --git a/swift_rpc/scheduler.py → swift_rpc/mq.py b/swift_rpc/scheduler.py → swift_rpc/mq.py
diff --git a/swift_rpc/server/__init__.py b/swift_rpc/server/__init__.py
@@ -42,11 +42,8 @@ def register_mq(self, func):
     def start(self, host, port):
         self.log.info('Starting server on port {0}'.format(port))
 #        app = web.Application(self._routes, debug=True)
-#        app.listen(int(port),host)
-#        ioloop.IOLoop.current().start()
-
         server = HTTPServer(web.Application(self._routes, debug=True),xheaders=True) 
-        server.listen(port, host)
+        server.listen(int(port), host)
         ioloop.IOLoop.current().start()
 
 __all__ = ('RPCServer')

diff --git a/swift_rpc/server/handlers.py b/swift_rpc/server/handlers.py
@@ -1,7 +1,7 @@
 from tornado import gen, log, web
 from tornado.concurrent import run_on_executor
 from concurrent.futures import ThreadPoolExecutor
-from swift_rpc.scheduler import q,redis_conn
+from swift_rpc.mq import q,redis_conn
 from config import *
 
 class _Handler(web.RequestHandler):

diff --git a/test_server.py b/test_server.py
@@ -16,7 +16,6 @@ def test_block(args):
 def test_async(arg):
     raise gen.Return("You said async %s" % arg)
 
-
 if __name__ == "__main__":
     server = RPCServer()
     server.register(test)