Project 1: Config system; ETags; error pages

1 files changed, 37 insertions, 26 deletions

diff --git a/project1/proj1_s4498062/webhttp/server.py b/project1/proj1_s4498062/webhttp/server.py
index b385636..7eeec27 100644
--- a/project1/proj1_s4498062/webhttp/server.py
+++ b/project1/proj1_s4498062/webhttp/server.py
@@ -3,13 +3,13 @@
 This module contains a HTTP server

 """

 

-from configparser import SafeConfigParser

 import threading

 import socket

 

 from composer import ResponseComposer

 from parser import RequestParser

 import weblogging as logging

+from config import config

 

 class ConnectionHandler(threading.Thread):

     """Connection Handler for HTTP Server"""

@@ -30,22 +30,28 @@ class ConnectionHandler(threading.Thread):
     

     def handle_connection(self):

         """Handle a new connection"""

-        rp = RequestParser()

-        rc = ResponseComposer(timeout=self.timeout)

+        self.rp = RequestParser()

+        self.rc = ResponseComposer(timeout=self.timeout)

 

         while True:

             data = self.conn_socket.recv(4096)

             if len(data) == 0:

                 break

-            for req in rp.parse_requests(data):

-                logging.info("<-- %s" % req.startline())

-                resp = rc.compose_response(req)

-                logging.info("--> %s" % resp.startline())

-                sent = self.conn_socket.send(str(resp))

-                if sent == 0:

-                    raise RuntimeError('Socket broken')

+            self.handle_data(data)

 

         self.conn_socket.close()

+

+    def handle_data(self, data):

+        for req in self.rp.parse_requests(data):

+            logging.info("<-- (%s) %s" % (self.addr[0], req.startline()))

+            resp = self.rc.compose_response(req)

+            logging.info("--> (%s) %s" % (self.addr[0], resp.startline()))

+            self.send(resp)

+

+    def send(self, data):

+        sent = self.conn_socket.send(str(data))

+        if sent == 0:

+            raise RuntimeError('Socket broken')

         

     def run(self):

         """Run the thread of the connection handler"""

@@ -53,12 +59,12 @@ class ConnectionHandler(threading.Thread):
             self.handle_connection()

         except socket.error, e:

             print('ERR ' + str(e))

-        

+

 

 class Server:

     """HTTP Server"""

 

-    def __init__(self, config, **kwargs):

+    def __init__(self, configfile, **kwargs):

         """Initialize the HTTP server

         

         Args:

@@ -66,27 +72,32 @@ class Server:
             server_port (int): port that the server is listening on

             timeout (int): seconds until timeout

         """

-        self.read_config(config, **kwargs)

+        self.read_config(configfile, **kwargs)

         self.done = False

 

-    def read_config(self, config, **kwargs):

-        self.cp = SafeConfigParser()

-        self.cp.read(config)

-        if not self.cp.has_section('webhttp'):

-            self.cp.add_section('webhttp')

-        for (name, val) in self.cp.items('webhttp') + kwargs.items():

-            setattr(self, name, val)

+    def read_config(self, configfile, **kwargs):

+        config().read(configfile)

+        

+        if not config().has_section('webhttp'):

+            config().add_section('webhttp')

+        

+        for name, val in kwargs.items():

+            if val != None:

+                config().set('webhttp', name, str(val))

     

     def run(self):

         """Run the HTTP Server and start listening"""

-        serversocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

-        serversocket.bind((self.hostname, self.port))

-        serversocket.listen(5)

+        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

+        self.socket.bind((config('hostname'), config('port', type=int)))

+        self.socket.listen(config('max_connections', type=int))

         while not self.done:

-            (clientsocket, addr) = serversocket.accept()

-            ch = ConnectionHandler(clientsocket, addr, self.timeout)

-            ch.run()

+            (csocket, addr) = self.socket.accept()

+            ch = ConnectionHandler(csocket, addr, config('timeout', type=int))

+            ch.start()

     

     def shutdown(self):

         """Safely shut down the HTTP server"""

+        self.socket.shutdown(socket.SHUT_RDWR)

+        self.socket.close()

         self.done = True

+