X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=server%2Fmain.c;h=6ea256c5de83d4b837c54d9ebd893f99a0c632cd;hb=b3e65dd9cefcc945e4f82e4c6b1764064a53cfeb;hp=b202418a922f6faca15e0008b321e4922ffb632d;hpb=0f827545e0eb6846608da4aaf4dc8047478070a4;p=matches%2FMCTX3420.git

diff --git a/server/main.c b/server/main.c
index b202418..6ea256c 100644
--- a/server/main.c
+++ b/server/main.c
@@ -7,6 +7,7 @@
 #include "common.h"
 #include "options.h"
 #include "sensor.h"
+#include "actuator.h"
 
 // --- Standard headers --- //
 #include <signal.h> // for signal handling
@@ -41,7 +42,7 @@ void SignalHandler(int signal)
 	// At the moment just always exit.
 	// Call `exit` so that Cleanup will be called to... clean up.
 	Log(LOGWARN, "Got signal %d (%s). Exiting.", signal, strsignal(signal));
-	Thread_QuitProgram(false);
+
 	//exit(signal);
 }
 
@@ -75,15 +76,17 @@ int main(int argc, char ** argv)
 		signal(signals[i], SignalHandler);
 	}
 	*/
-	Sensor_Spawn();
+	Sensor_Init();
+	Actuator_Init();
+	Sensor_StartAll("test");
+	Actuator_StartAll("test");
 
 	// run request thread in the main thread
 	FCGI_RequestLoop(NULL);
 
-	// Join the dark side, Luke
-	// *cough*
-	// Join the sensor threads
-	Sensor_Join();
+	Sensor_StopAll();
+	Actuator_StopAll();
+
 	Cleanup();
 	return 0;
 }