Switch to syslog for logging messages.

[matches/MCTX3420.git] / server / main.c

diff --git a/server/main.c b/server/main.c
index 5e2c6c8..c032eb1 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -1,22 +1,21 @@
 /**
  * @file main.c
- * @purpose main and its helper functions, signal handling and cleanup functions
+ * @brief main and its helper functions, signal handling and cleanup functions
  */
-#include "common.h"
-
-
-// --- Standard headers --- //
-#include <signal.h> // for signal handling
 
 // --- Custom headers --- //
-#include "query.h"
-#include "log.h"
+#include "common.h"
 #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 --- //
 Options g_options; // options passed to program through command line arguments
-Sensor g_sensors[NUMSENSORS]; // sensors array
 
 // --- Function definitions --- //
 
@@ -29,6 +28,7 @@ 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
        Log(LOGDEBUG, "Called as %s with %d arguments.", g_options.program, argc);
 }
 
@@ -38,12 +38,14 @@ void ParseArguments(int argc, char ** argv)
  */
 //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);
+
+       //exit(signal);
 }
 
 /**
@@ -61,20 +63,41 @@ void Cleanup()
  * @param argc - Num args
  * @param argv - Args
  * @returns 0 on success, error code on failure
+ * NOTE: NEVER USE exit(3)! Instead call Thread_QuitProgram
  */
 int main(int argc, char ** argv)
 {
        ParseArguments(argc, argv);
 
-       // start sensor threads
-       for (int i = 0; i < NUMSENSORS; ++i)
+       //Open the system log
+       openlog("mctxserv", LOG_PID | LOG_PERROR, LOG_USER);
+       Log(LOGINFO, "Server started");
+       // signal handler
+       //TODO: Make this work
+       /*
+       int signals[] = {SIGINT, SIGSEGV, SIGTERM};
+       for (int i = 0; i < sizeof(signals)/sizeof(int); ++i)
        {
-               Sensor_Init(g_sensors+i, i);
-               pthread_create(&(g_sensors[i].thread), NULL, Sensor_Main, (void*)(g_sensors+i));
+               signal(signals[i], SignalHandler);
        }
+       */
+       Sensor_Init();
+       Actuator_Init();
+       //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
-       Query_Main(NULL); //TODO: Replace with FastCGI code
+       FCGI_RequestLoop(NULL);
+
+       if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
+               Fatal("Control_SetMode failed with '%s'", ret);
+       //Sensor_StopAll();
+       //Actuator_StopAll();
+
+       Cleanup();
        return 0;
 }