X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=c032eb10739f046fdf4489fdd77a9acd41fb8739;hb=5d57467589ecefdf5bb5985005705a1c8460c623;hp=6ea256c5de83d4b837c54d9ebd893f99a0c632cd;hpb=81531e1d969957d5757887f1646d26093af96ff1;p=matches%2FMCTX3420.git

diff --git a/server/main.c b/server/main.c
index 6ea256c..c032eb1 100644
--- a/server/main.c
+++ b/server/main.c
@@ -8,8 +8,10 @@
 #include "options.h"
 #include "sensor.h"
 #include "actuator.h"
+#include "control.h"
 
 // --- Standard headers --- //
+#include <syslog.h> // for system logging
 #include <signal.h> // for signal handling
 
 // --- Variable definitions --- //
@@ -67,6 +69,9 @@ int main(int argc, char ** argv)
 {
 	ParseArguments(argc, argv);
 
+	//Open the system log
+	openlog("mctxserv", LOG_PID | LOG_PERROR, LOG_USER);
+	Log(LOGINFO, "Server started");
 	// signal handler
 	//TODO: Make this work
 	/*
@@ -78,14 +83,19 @@ int main(int argc, char ** argv)
 	*/
 	Sensor_Init();
 	Actuator_Init();
-	Sensor_StartAll("test");
-	Actuator_StartAll("test");
+	//Sensor_StartAll("test");
+	//Actuator_StartAll("test");
+	const char *ret;
+	if ((ret = Control_SetMode(CONTROL_START, "test")) != NULL)
+		Fatal("Control_SetMode failed with '%s'", ret);
 
 	// run request thread in the main thread
 	FCGI_RequestLoop(NULL);
 
-	Sensor_StopAll();
-	Actuator_StopAll();
+	if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
+		Fatal("Control_SetMode failed with '%s'", ret);
+	//Sensor_StopAll();
+	//Actuator_StopAll();
 
 	Cleanup();
 	return 0;