Adde tut 9

Author: chewett

README.md

@@ -14,21 +14,17 @@ Later we will get onto more complicated topics such as reaching a consensus of w
 
 Questions comments and suggestions can be raised the specific blog post or by using issues here.
 
-## Tutorial 8 - Slave Helper Functions
+## Tutorial 9 - Multi Slave Master
 
-This tutorial focuses on creating a number of slave helper functions
- to begin the process of fully automating the slaves.
- 
-A few simple commands such as shutting down a node and rebooting
- it along with updating the operating system are added ready for
- implementation.
+This tutorial focuses on changing the master so that it accepts
+multiple slaves connecting to it.
 
-The next tutorial will focus on converting the master script
- to accept any number of slave nodes.
+Currently there is no error handling for nodes connecting and disconnecting.
+The next tutorial will focus on hardening the master and slaves connection/disconnection code.
 
 The full details for
-[Tutorial 08 - Slave Helper Functions is available on my blog](
-https://chewett.co.uk/blog/1839/raspberry-pi-cluster-node-08-slave-helper-functions/
+[Tutorial 09 - Multi Slave Master is available on my blog](
+https://chewett.co.uk/blog/1872/raspberry-pi-cluster-node-09-multi-slave-master/
 )
 
 ## Requirements

RpiCluster/RpiClusterClient.py

@@ -0,0 +1,33 @@
+import json
+import threading
+from DataPackager import get_message, create_payload
+from MachineInfo import get_base_machine_info
+from MainLogger import logger
+
+
+class RpiClusterClient(threading.Thread):
+
+    def __init__(self, clientsocket, address):
+        threading.Thread.__init__(self)
+        self.clientsocket = clientsocket
+        self.address = address
+
+    def run(self):
+        message = True
+        while message:
+            message = get_message(self.clientsocket)
+            if message:
+                if message['type'] == 'message':
+                    logger.info("Received message: " + message['payload'])
+                elif message['type'] == 'computer_details':
+                    logger.info("Computer specifications: " + json.dumps(message['payload']))
+                elif message['type'] == 'info':
+                    logger.info("Slave wants to know my info about " + message['payload'])
+                    if message['payload'] == 'computer_details':
+                        self.clientsocket.send(create_payload(get_base_machine_info(), "master_info"))
+                    else:
+                        self.clientsocket.send(create_payload("unknown", "bad_message"))
+
+            else:
+                logger.info("Client disconnected at address {addr}".format(addr=self.address))
+

basic_master.py

@@ -2,10 +2,8 @@
 
 import socket
 import ConfigParser
-import json
 from RpiCluster.MainLogger import add_file_logger, logger
-from RpiCluster.DataPackager import get_message, create_payload
-from RpiCluster.MachineInfo import get_base_machine_info
+from RpiCluster.RpiClusterClient import RpiClusterClient
 
 config = ConfigParser.ConfigParser()
 config.read('rpicluster.cfg')
@@ -18,25 +16,11 @@
 
 socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 socket.bind((socket_bind_ip, socket_port))
-socket.listen(1)
 
-(clientsocket, address) = socket.accept()
-logger.info("Got client at {address}".format(address=address))
+socket.listen(10) #listen to 10 connects
+while True:
+    (clientsocket, address) = socket.accept()
+    logger.info("Got client at {address}".format(address=address))
 
-message = True
-while message:
-    message = get_message(clientsocket)
-    if message:
-        if message['type'] == 'message':
-            logger.info("Received message: " + message['payload'])
-        elif message['type'] == 'computer_details':
-            logger.info("Computer specifications: " + json.dumps(message['payload']))
-        elif message['type'] == 'info':
-            logger.info("Slave wants to know my info about " + message['payload'])
-            if message['payload'] == 'computer_details':
-                clientsocket.send(create_payload(get_base_machine_info(), "master_info"))
-            else:
-                clientsocket.send(create_payload("unknown", "bad_message"))
-
-    else:
-        logger.info("Client disconnected")
+    rpiClient = RpiClusterClient(clientsocket, address)
+    rpiClient.start()