X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=0a39ae9c7da4370e3f31b90c5a7d3727b052faf1;hb=5a9a05166c4b22e7b7a522063d3dd6f75d1fa589;hp=92f76b37b1f911965eeecb580763430310bd140f;hpb=289794ba2dcbe6234e25e5d00531b26baee342b7;p=matches%2FMCTX3420.git

diff --git a/server/main.c b/server/main.c
index 92f76b3..0a39ae9 100644
--- a/server/main.c
+++ b/server/main.c
@@ -33,7 +33,11 @@ void ParseArguments(int argc, char ** argv)
 
 	g_options.program = argv[0]; // program name
 	g_options.verbosity = LOGDEBUG; // default log level
-	gettimeofday(&(g_options.start_time), NULL); // Start time
+	// 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));
+
+	clock_gettime(CLOCK_MONOTONIC, &(g_options.start_time)); // Start time
 
 
 	g_options.auth_method = AUTH_NONE;  // Don't use authentication
@@ -85,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')
 	{
@@ -128,15 +133,19 @@ int main(int argc, char ** argv)
 	Pin_Init();
 	
 	// 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();