All - Rework config API to allow default/optional values
[tpg/opendispense2.git] / src / server / main.c
index 0692d6a..3e06230 100644 (file)
@@ -9,6 +9,7 @@
  */
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdbool.h>
 #include <string.h>
 #include <signal.h>
 #include "common.h"
 #include <fcntl.h>
 #include <stdarg.h>
 #include <syslog.h>
+#include <pthread.h>
 #include "../cokebank.h"
+#include "../common/config.h"
 
 // === IMPORTS ===
 extern void    Init_Handlers(void);
 extern void    Load_Itemlist(void);
 extern void    Server_Start(void);
+extern bool    gbServer_RunInBackground;
 extern int     giServer_Port;
-extern char    *gsItemListFile;
-extern char    *gsCoke_SerialPort;
-extern char    *gsSnack_SerialPort;
+extern const char      *gsItemListFile;
+extern const char      *gsCoke_ModbusAddress;
+extern int     giCoke_ModbusPort;
+extern const char      *gsDoor_SerialPort;
+extern bool    gbSyslogEnabled;
+
+// === PROTOTYPES ===
+void   *Periodic_Thread(void *Unused);
 
 // === GLOBALS ===
  int   giDebugLevel = 0;
-char   *gsCokebankPath = "cokebank.db";
+bool   gbNoCostMode = 0;
+const char     *gsCokebankPath = "cokebank.db";
+// - Functions called every 20s (or so)
+#define ciMaxPeriodics 10
+struct sPeriodicCall {
+       void    (*Function)(void);
+}      gaPeriodicCalls[ciMaxPeriodics];
+pthread_t      gTimerThread;
 
 // === CODE ===
 void sigint_handler()
@@ -39,49 +55,108 @@ void sigint_handler()
        exit(0);
 }
 
+void PrintUsage(const char *progname)
+{
+       fprintf(stderr, "Usage: %s\n", progname);
+       fprintf(stderr, "  -f,--configfile\n");
+       fprintf(stderr, "        Set the config file path (default `dispsrv.conf')\n");
+       fprintf(stderr, "  -d    Set debug level (0 - 2, default 0)\n");
+       fprintf(stderr, "  --[dont-]daemonise\n");
+       fprintf(stderr, "        Run (or explicitly don't run) the server disconnected from the terminal\n");
+}
+
 int main(int argc, char *argv[])
 {
         int    i;
-       
+       const char      *config_file = "dispsrv.conf";
+
        // Parse Arguments
        for( i = 1; i < argc; i++ )
        {
                char    *arg = argv[i];
-               if( arg[0] == '-' && arg[1] != '-')
+               if( arg[0] != '-' )
+               {
+                       // No free arguments please
+                       PrintUsage(argv[0]);
+                       return -1;
+               }
+               else if( arg[1] != '-' )
                {
+                       // Single character arguments
+                       // - TODO: Process in a loop
                        switch(arg[1])
                        {
-                       case 'p':
-                               giServer_Port = atoi(argv[++i]);
+                       case 'f':
+                               if( i + 1 >= argc )     return -1;
+                               config_file = argv[++i];
                                break;
                        case 'd':
-                               giDebugLevel = atoi(argv[++i]);
+                               if( i + 1 >= argc )     return -1;
+                               Config_AddValue("debug_level", argv[++i]);
+                               giDebugLevel = atoi(argv[i]);
                                break;
                        default:
-                               // Usage Error?
-                               break;
+                               // Usage Error
+                               fprintf(stderr, "Unknown option '-%c'\n", arg[1]);
+                               PrintUsage(argv[0]);
+                               return -1;
                        }
                }
-               else if( arg[0] == '-' && arg[1] == '-' ) {
-                       if( strcmp(arg, "--itemsfile") == 0 ) {
-                               gsItemListFile = argv[++i];
+               else
+               {
+                       // Long arguments
+                       if( strcmp(arg, "--configfile") == 0 ) {
+                               if( i + 1 >= argc )     return -1;
+                               config_file = argv[++i];
                        }
-                       else if( strcmp(arg, "--cokeport") == 0 ) {
-                               gsCoke_SerialPort = argv[++i];
+                       else if( strcmp(arg, "--daemonise") == 0 ) {
+                               Config_AddValue("daemonise", "true");
                        }
-                       else if( strcmp(arg, "--snackport") == 0 ) {
-                               gsSnack_SerialPort = argv[++i];
+                       else if( strcmp(arg, "--dont-daemonise") == 0 ) {
+                               Config_AddValue("daemonise", "false");
                        }
                        else {
-                               // Usage error?
+                               // Usage error
+                               fprintf(stderr, "Unknown option '%s'\n", arg);
+                               PrintUsage(argv[0]);
+                               return -1;
                        }
                }
-               else {
-                       // Usage Error?
+       }
+
+       if( Config_ParseFile( config_file ) ) {
+               fprintf(stderr, "NOTICE: Loading of config file '%s' failed, using defaults\n", config_file);
+       }
+
+       // Parse config values
+       {
+               bool rv = true;
+               #define REQ_CFG(variable, type, name)   rv = Config_GetValue_##type(name, &variable) && rv
+               #define OPT_CFG(variable, type, name)        Config_GetValue_##type(name, &variable)
+               OPT_CFG(gbServer_RunInBackground, Bool, "daemonise");
+               OPT_CFG(giServer_Port, Int, "server_port");
+               
+               REQ_CFG(gsCokebankPath, Str, "cokebank_database");
+               REQ_CFG(gsItemListFile, Str, "items_file");
+
+               OPT_CFG(gsDoor_SerialPort, Str, "door_serial_port");
+               REQ_CFG(gsCoke_ModbusAddress, Str, "coke_modbus_address");
+               OPT_CFG(giCoke_ModbusPort,    Int,    "coke_modbus_port");
+               
+               OPT_CFG(gbNoCostMode,    Bool, "test_mode");
+               OPT_CFG(gbSyslogEnabled, Bool, "disable_syslog");
+               
+               if( !rv ) {
+                       fprintf(stderr, "ERROR: Some required configuration items were missing\n");
+                       return -1;
                }
        }
-       
+
+       // - Cleanly tear down the server on SIGINT/SIGTERM
        signal(SIGINT, sigint_handler);
+       signal(SIGTERM, sigint_handler);
+       // - ignore SIGPIPE to prevent a crashing client from bringing the server down too
+       signal(SIGPIPE, SIG_IGN);
        
        openlog("odispense2", 0, LOG_LOCAL4);
        
@@ -94,40 +169,45 @@ int main(int argc, char *argv[])
        
        Server_Start();
        
+       if(gTimerThread)
+               pthread_kill(gTimerThread, SIGKILL);
 
        return 0;
 }
 
-int RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *matches, const char *errorMessage)
+void *Periodic_Thread(void *Unused __attribute__((unused)))
 {
-        int    ret;
+        int    i;
        
-       ret = regexec(regex, string, nMatches, matches, 0);
-       if( ret == REG_NOMATCH ) {
-               return -1;
-       }
-       if( ret ) {
-               size_t  len = regerror(ret, regex, NULL, 0);
-               char    errorStr[len];
-               regerror(ret, regex, errorStr, len);
-               printf("string = '%s'\n", string);
-               fprintf(stderr, "%s\n%s", errorMessage, errorStr);
-               exit(-1);
+       for( ;; )
+       {
+               sleep(10);      // Sleep for a while
+//             printf("Periodic firing\n");
+               for( i = 0; i < ciMaxPeriodics; i ++ )
+               {
+                       if( gaPeriodicCalls[i].Function )
+                               gaPeriodicCalls[i].Function();
+               }
        }
-       
-       return ret;
+       return NULL;
 }
 
-void CompileRegex(regex_t *regex, const char *pattern, int flags)
+void StartPeriodicThread(void)
 {
-        int    ret = regcomp(regex, pattern, flags);
-       if( ret ) {
-               size_t  len = regerror(ret, regex, NULL, 0);
-               char    errorStr[len];
-               regerror(ret, regex, errorStr, len);
-               fprintf(stderr, "Regex compilation failed - %s\n", errorStr);
-               exit(-1);
+       pthread_create( &gTimerThread, NULL, Periodic_Thread, NULL );
+}
+
+void AddPeriodicFunction(void (*Fcn)(void))
+{
+       int i;
+       for( i = 0; i < ciMaxPeriodics; i ++ )
+       {
+               if( gaPeriodicCalls[i].Function )       continue;
+               gaPeriodicCalls[i].Function = Fcn;
+               return ;
        }
+       
+       fprintf(stderr, "Error: No space for %p in periodic list\n", Fcn);
 }
 
 // Serial helper
@@ -142,12 +222,18 @@ int InitSerial(const char *File, int BaudRate)
        
        switch(BaudRate)
        {
+       case 1200:      baud = B1200;   break;
        case 9600:      baud = B9600;   break;
-       default:        close(fd);      return -1;
+       case 115200:    baud = B115200; break;
+       default:
+               fprintf(stderr, "ERROR: Invalid baud rate to InitSerial (%i)\n", BaudRate);
+               exit(1);
        }
        
        info.c_lflag = 0;       // Non-Canoical, No Echo
        info.c_cflag = baud | CS8 | CLOCAL | CREAD;     // baud, 8N1
+       info.c_iflag = IGNCR;   // Ignore \r
+       info.c_oflag = 0;       // ???
        cfsetspeed(&info, baud);
        info.c_cc[VTIME] = 0;   // No time limit
        info.c_cc[VMIN] = 1;    // Block until 1 char

UCC git Repository :: git.ucc.asn.au