X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=7933bab7c3394b60f07746fdec199e143dc2ed57;hb=e3e7914fe2f59765e5f92371329652a02518928c;hp=ecdf0682ef750ce29911001d281aed61dfeb025f;hpb=01ea4e1cddca0bbf359739a1fefffdccada60481;p=matches%2FMCTX3420.git

diff --git a/server/main.c b/server/main.c
index ecdf068..7933bab 100644
--- a/server/main.c
+++ b/server/main.c
@@ -16,6 +16,7 @@
 #include <syslog.h> // for system logging
 #include <signal.h> // for signal handling
 
+
 // --- Variable definitions --- //
 Options g_options; // options passed to program through command line arguments
 
@@ -32,6 +33,10 @@ void ParseArguments(int argc, char ** argv)
 
 	g_options.program = argv[0]; // program name
 	g_options.verbosity = LOGDEBUG; // default log level
+	// Set the main directory
+	if (getcwd(g_options.root_dir, sizeof(g_options.root_dir)) == NULL)
+		Fatal("Couldn't get current working directory - %s", strerror(errno));
+
 	gettimeofday(&(g_options.start_time), NULL); // Start time
 
 
@@ -84,6 +89,7 @@ void ParseArguments(int argc, char ** argv)
 	Log(LOGDEBUG, "Pin Module Enabled: %d", g_options.enable_pin);
 	Log(LOGDEBUG, "Auth URI: %s", g_options.auth_uri);
 	Log(LOGDEBUG, "LDAP Base DN: %s", g_options.ldap_base_dn);
+	Log(LOGDEBUG, "Root directory: %s", g_options.root_dir);
 
 	if (g_options.auth_uri[0] != '\0')
 	{
@@ -96,30 +102,15 @@ void ParseArguments(int argc, char ** argv)
 	
 }
 
-/**
- * Handle a signal
- * @param signal - The signal number
- */
-//TODO: Something that gets massively annoying with threads is that you can't predict which one gets the signal
-// There are ways to deal with this, but I can't remember them
-// Probably sufficient to just call Thread_QuitProgram here
-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));
-
-	//exit(signal);
-}
-
 /**
  * Cleanup before the program exits
  */
 void Cleanup()
 {
 	Log(LOGDEBUG, "Begin cleanup.");
+	Sensor_Cleanup();
+	//Actuator_Cleanup();
 	Log(LOGDEBUG, "Finish cleanup.");
-
 }
 
 /**
@@ -135,33 +126,26 @@ int main(int argc, char ** argv)
 	openlog("mctxserv", LOG_PID | LOG_PERROR, LOG_USER);
 	Log(LOGINFO, "Server started");
 
-	ParseArguments(argc, argv);
-
-	//Open the system log
+	ParseArguments(argc, argv); // Setup the g_options structure from program arguments
 
-	// signal handler
-	//TODO: Make this work
-	/*
-	int signals[] = {SIGINT, SIGSEGV, SIGTERM};
-	for (int i = 0; i < sizeof(signals)/sizeof(int); ++i)
-	{
-		signal(signals[i], SignalHandler);
-	}
-	*/
 	Sensor_Init();
 	Actuator_Init();
 	Pin_Init();
-	//Sensor_StartAll("test");
-	//Actuator_StartAll("test");
+	
+	// Try and start things
+	/*
 	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);
 
+	/*
 	if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
 		Fatal("Control_SetMode failed with '%s'", ret);
+	*/
 	//Sensor_StopAll();
 	//Actuator_StopAll();