Merge pull request #10 from troublegum/dev

Release 1.5

Author: troublegum

README.md

@@ -7,7 +7,7 @@
 ## Install
 
 Download a code and unpack it into your project folder.
-Use Thonny IDE or other IDE for upload your code in ESP8266/ESP32 board.
+Use [Thonny IDE](https://thonny.org/) or other IDE for upload your code in ESP8266/ESP32 board.
 
 ## Quick start
 
@@ -232,6 +232,8 @@ Constructor - srv = MicroPyServer(host="0.0.0.0", port=80)
 
 Start server - srv.start() 
 
+Stop server - srv.stop()
+
 Add new route - srv.add_route(path, handler, method="GET")
 
 Send response to client - srv.send(response)
@@ -249,7 +251,7 @@ Set handler on server error - server.on_error(handler)
 
 Send response to client - utils.send_response(server, response, http_code=200, content_type="text/html", extend_headers=None)
 
-Get HTTP request method (example of return value: POST) - utils.get_request_method(request)
+Return HTTP request method (example of return value: POST) - utils.get_request_method(request)
 
 Return http request query string (example of return value: param_one=one&param_two=two) - utils.get_request_query_string(request)
 

micropyserver.py

@@ -42,16 +42,20 @@ def __init__(self, host="0.0.0.0", port=80):
         self._on_request_handler = None
         self._on_not_found_handler = None
         self._on_error_handler = None
+        self._sock = None
 
     def start(self):
         """ Start server """
-        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        sock.bind((self._host, self._port))
-        sock.listen(1)
+        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self._sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        self._sock.bind((self._host, self._port))
+        self._sock.listen(1)
+        print("Server start")
         while True:
+            if self._sock is None:
+                break
             try:
-                self._connect, address = sock.accept()
+                self._connect, address = self._sock.accept()
                 request = self.get_request()
                 if len(request) == 0:
                     self._connect.close()
@@ -69,6 +73,13 @@ def start(self):
             finally:
                 self._connect.close()
 
+    def stop(self):
+        """ Stop the server """
+        self._connect.close()
+        self._sock.close()
+        self._sock = None
+        print("Server stop")
+
     def add_route(self, path, handler, method="GET"):
         """ Add new route  """
         self._routes.append(
@@ -140,3 +151,4 @@ def _internal_error(self, error):
             self.send("Error: " + str_error)
             print(str_error)
 
+