enhance xhttp server

meig · meig · commit ff64628a0628 · 2014-07-08T18:00:52.000+08:00
diff --git a/pub/common/error.py b/pub/common/error.py
@@ -46,6 +46,9 @@ def pack_errinfo_json(error,detail=None):
 def match(code,error_tuple):
     return code == error_tuple[0]
 
+def pack_ok_json():
+    return '{"result":"ok"}'
+
 if __name__ == "__main__":
     print pack_errinfo_json(ERROR_INTERNAL_SERVER_ERROR,"shit")
     raw_input()
diff --git a/pub/common/utils.py b/pub/common/utils.py
@@ -4,6 +4,7 @@
 # -*- coding:utf-8 -*- 
 import sys
 import os
+import os.path
 import platform
 
 def get_cur_info_within_exception():
@@ -100,9 +101,30 @@ def test_directory(test_dir):
         return False
     return True
 
-
+def rmdir_r(path,ignore_error=False):
+    items = os.listdir(path)
+    for item in items:
+        try:
+            fullpath = os.path.join(path,item)
+            if os.path.isdir(fullpath):
+                rmdir_r(fullpath,ignore_error)
+            else:
+                os.remove(fullpath)
+        except Exception:
+            if ignore_error:
+                continue
+            else:
+                break
+    os.rmdir(path)
 
 if __name__ == '__main__':
     test()
     print get_local_addr()
-    os.system("pause")
+    os.system("pause")
+
+    try:
+        rmdir_r(r"E:\git__\flashp2p\livems_refactor\live_master\pub\common\tp1")
+    except Exception,e:
+        print str(e)
+
+    raw_input("press")
diff --git a/pub/xhttp/xhttp_server.py b/pub/xhttp/xhttp_server.py
@@ -1,34 +1,62 @@
 #!/usr/bin/python
 # -*- coding:utf-8 -*- 
 
+import httplib
+import re
 import tornado.httpserver
 import tornado.ioloop
-from common import error
-import urls
+import xhttp_utils
+from pub.common import error
 
 class XRequestHandler(object):
     ''' Callback handler to dispatch and handle request'''
 
-    def __init__(self,url_map):
-        self.__router = url_map
+    def __init__(self,url_match_list):
+        self.__router = url_match_list
 
     def handle_request(self,request):
-        if self.__router.has_key(request.path):
-            handler = self.__router[request.path]
+        #if self.__router.has_key(request.path):
+        #    handler = self.__router[request.path]
+        #else:
+        #    handler = None
+        request_handler = None
+        for re_str,handler in self.__router:
+            if re.match(re_str,request.path):
+                request_handler = handler
+                break
+        if not request_handler:
+            resp = xhttp_utils.render_to_response(None,404)
         else:
-            handler = None
-        if not handler:
-            body = error.pack_errinfo_json(error.ERROR_HTTP_URL_NOT_SUPPORTED)
-        else:
-            body = handler(request)
-        message = "HTTP/1.1 200 OK\r\nContent-Length:%d\r\n\r\n%s" % (len(body),body)
+            try:
+                resp = request_handler(request)
+            except Exception,e:
+                resp = xhttp_utils.render_to_response(None,500)
+        message = resp.pack_http_response_buf()
         request.write(message)
         request.finish()
 
-def start(port,url_map=None):
+def pack_response(code,headers={},body=""):
+    status = httplib.responses.get(code)
+    if not status:
+        status = "Unknown"
+    segs = []
+    segs.append("HTTP/1.1 %u %s" % (code,status))
+    for key,value in headers.iteritems():
+        segs.append("%s:%s"%(key,value))
+    body = str(body)
+    segs.append("Content-Length:%d" % len(body))
+    message = "%s\r\n\r\n%s" % ("\r\n".join(segs),body)
+    return message
+
+def start(ports,url_map=None,_no_keep_alive=True):
     request_handler = XRequestHandler(url_map)
-    http_server = tornado.httpserver.HTTPServer(request_handler.handle_request,no_keep_alive=True)
-    http_server.listen(int(port))
+    if not isinstance(ports,tuple):
+        ports = (ports,)
+    for port in ports:
+        http_server = tornado.httpserver.HTTPServer(request_handler.handle_request,no_keep_alive=_no_keep_alive)
+        http_server.listen(int(port))
     tornado.ioloop.IOLoop.instance().start()
-    print "thread to quit:Main Thread"
-    return True
+    return True
+
+def stop():
+    tornado.ioloop.IOLoop.instance().stop()
diff --git a/pub/xhttp/xhttp_utils.py b/pub/xhttp/xhttp_utils.py
@@ -0,0 +1,42 @@
+#!/usr/bin/python
+# -*- coding:utf-8 -*- 
+
+import httplib
+
+class ServerResponse(object):
+    def __init__(self,code,headers,body):
+        self.code = code
+        self.headers = headers
+        self.body = body
+
+    def pack_http_response_buf(self):
+        status = httplib.responses.get(self.code)
+        if not status:
+            status = "Unknown"
+        segs = []
+        segs.append("HTTP/1.1 %u %s" % (self.code,status))
+        for key,value in self.headers.iteritems():
+            segs.append("%s:%s"%(key,value))
+        if self.body == None:
+            body = status
+        else:
+            body = str(self.body)
+        segs.append("Content-Length:%d" % len(body))
+        message = "%s\r\n\r\n%s" % ("\r\n".join(segs),body)
+        return message
+
+def render_to_response(body,code=200,headers={}):
+    return ServerResponse(code,headers,body)
+
+def pack_response(code):
+    resp = render_to_response("",code)
+    return resp.pack_http_response_buf()
+
+def login_required(auth_func):
+    def _deco(handler):
+        def __deco(request):
+            if auth_func(request):
+                return handler(request)
+            return render_to_response("",401,{"WWW-Authenticate":'Basic realm="insert realm"'})
+        return __deco
+    return _deco
