Automatic commit of irc logs

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

diff --git a/server/main.c b/server/main.c
index 5aef29f..a4b7c5a 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -36,13 +36,11 @@ Options g_options; // options passed to program through command line arguments
  */
 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));
+       //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
 
@@ -50,9 +48,8 @@ void ParseArguments(int argc, char ** argv)
        g_options.auth_method = AUTH_NONE;  // Don't use authentication
        g_options.auth_uri = ""; // 
        g_options.ldap_base_dn = "";
+       g_options.experiment_dir = ".";
        
-
-
        for (int i = 1; i < argc; ++i)
        {
                if (argv[i][0] != '-')
@@ -83,6 +80,10 @@ void ParseArguments(int argc, char ** argv)
                        case 'd':
                                g_options.ldap_base_dn = argv[++i];
                                break;
+                       case 'e':
+                       // Experiments directory
+                               g_options.experiment_dir = argv[++i];
+                               break;
                        default:
                                Fatal("Unrecognised switch %s", argv[i]);
                                break;
@@ -96,7 +97,13 @@ 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);
+       //Log(LOGDEBUG, "Root directory: %s", g_options.root_dir);
+       Log(LOGDEBUG, "Experiment directory: %s", g_options.experiment_dir);
+
+       if (!DirExists(g_options.experiment_dir))
+       {
+               Fatal("Experiment directory '%s' does not exist.", g_options.experiment_dir);
+       }
 
        if (g_options.auth_uri[0] != '\0')
        {
@@ -116,7 +123,7 @@ void Cleanup()
 {
        Log(LOGDEBUG, "Begin cleanup.");
        Sensor_Cleanup();
-       //Actuator_Cleanup();
+       Actuator_Cleanup();
        Log(LOGDEBUG, "Finish cleanup.");
 }
 
@@ -192,23 +199,22 @@ int main(int argc, char ** argv)
 
        
 
-       Sensor_Init();
-       Actuator_Init();
        Pin_Init();
        
        // Try and start things
        
-       const char *ret;
-       if ((ret = Control_SetMode(CONTROL_START, "test")) != NULL)
-               Fatal("Control_SetMode failed with '%s'", ret);
+       //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);
+       Control_SetMode(CONTROL_STOP, NULL);
+       //if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
+       //      Fatal("Control_SetMode failed with '%s'", ret);
        
        //Sensor_StopAll();
        //Actuator_StopAll();