fix config inherit

rfyiamcool · rfyiamcool · commit e2fc3d91b89f · 2015-11-11T23:06:58.000+08:00
diff --git a/swift_rpc/server/__init__.py b/swift_rpc/server/__init__.py
@@ -12,10 +12,11 @@
 
 class RPCServer(object):
 
-    def __init__(self,logfile=None):
+    def __init__(self,config):
+        self.config = config
         self._routes = []
-        if logfile:
-            self.log = get_logger(logfile)
+        if config.LOGFILE:
+            self.log = get_logger(config.LOGFILE)
         else:
             self.log = log.logging.getLogger()
         log.enable_pretty_logging(logger=self.log)
@@ -27,7 +28,7 @@ def _getroutes(self):
 
     def _make(self, func, base):
         name = func.__name__
-        handler = type(name, (base,), {'func': [func]})
+        handler = type(name, (base,), {'func': [func],'config':self.config})
         self._routes.append((r'/{0}'.format(name), handler))
         self.log.info('Registered {0} command {1}'.format(base.TYPE, name))
 
diff --git a/swift_rpc/server/handlers.py b/swift_rpc/server/handlers.py
@@ -4,7 +4,6 @@
 from tornado.concurrent import run_on_executor
 from concurrent.futures import ThreadPoolExecutor
 from swift_rpc.mq import rq_conn,redis_conn
-from config import *
 
 class _Handler(web.RequestHandler):
     __ALLOWEDUA__ = ('swift_rpc')
@@ -16,25 +15,25 @@ def initialize(self):
 
     @gen.coroutine
     def prepare(self):
-        if SAFE_UA_MODE:
+        if self.config.SAFE_UA_MODE:
             ua = self.request.headers.get('User-Agent')
             #if ua not in self.__ALLOWEDUA__:
-            if ua not in UA_ALLOW:
+            if ua not in self.config.UA_ALLOW:
                 self.log.info('Received request from UA {0}'.format(ua))
                 self.write({'error': 'User agent not allowed: {0}'.format(ua)})
                 self.finish()
 
-        if SAFE_TOKEN_MODE:
+        if self.config.SAFE_TOKEN_MODE:
             token = self.request.headers.get('Token')
-            if token not in TOKEN_ALLOW:
+            if token not in self.TOKEN_ALLOW:
                 self.log.info('Received request from Token {0}'.format(token))
                 self.write({'error': 'Token not allowed: {0}'.format(token)})
                 self.finish()
 
-        if REMOTE_IP_MODE:
+        if self.config.REMOTE_IP_MODE:
             remote_ip = self.request.headers.get("X-Real-IP")
             remote_ip = remote_ip if remote_ip else self.request.remote_ip
-            if remote_ip not in REMOTE_ALLOW:
+            if remote_ip not in self.config.REMOTE_ALLOW:
                 self.log.info('Received request from REMOTE IP {0}'.format(remote_ip))
                 self.write({'error': 'IP not allowed: {0}'.format(remote_ip)})
                 self.finish()
@@ -103,17 +102,14 @@ class _MessageQueueBase(_Handler):
     @gen.coroutine
     def get(self):
         args, kwargs = yield self.args_kwargs()
-        print args,kwargs
         try:
             job = rq_conn.enqueue('api.'+self.func[0].func_name,*args,**kwargs)
             """
             will fix better
-            #result = q.enqueue("test_server."+self.func[0].func_name, *args,**kwargs)
 #           r.lpush('task',msgpack.packb([self.func[0].func_name,args,kwargs]))
             """
             self.write({'response': 'commit','job':job.key})
         except Exception as e:
-            print str(e)
             self.write({'error': str(e)})
 
 if __name__ == "__main__":
