diff options
author | Justin Lewis <jtl1728@rit.edu> | 2010-01-08 15:59:54 (GMT) |
---|---|---|
committer | Justin Lewis <jtl1728@rit.edu> | 2010-01-08 15:59:54 (GMT) |
commit | c0e069be9ea395354fd80915da5d5cfa5ccc7b53 (patch) | |
tree | 9efaa7a35e060a169075148722f3da2e93529116 | |
parent | e862019244af94097ad6ea4603893b8a04797575 (diff) |
Fixed multi-thread issue in server
-rw-r--r-- | FileShare.server/server.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/FileShare.server/server.py b/FileShare.server/server.py index f03f142..231c35e 100644 --- a/FileShare.server/server.py +++ b/FileShare.server/server.py @@ -1,4 +1,5 @@ import BaseHTTPServer +import SocketServer import simplejson import os import cgi @@ -176,11 +177,22 @@ class MyServer(BaseHTTPServer.BaseHTTPRequestHandler): self.send_error(404,'File Not Found (POST): %s' % self.path) -def run(server_class=BaseHTTPServer.HTTPServer, handler_class=MyServer): + + +class myWebServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer): + pass + + + +def run(server_class=BaseHTTPServer.HTTPServer, handler_class=BaseHTTPServer.BaseHTTPRequestHandler): server_address = ('', port) httpd = server_class(server_address, handler_class) httpd.serve_forever() if __name__ == '__main__': fileMan = FileManager() - run() + run(myWebServer, MyServer) + + # Activate the server; this will keep running until you + # interrupt the program with Ctrl-C + server.serve_forever() |