git.ucc.asn.au
/
tpg
/
opendispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial move to common config code directory
[tpg/opendispense2.git]
/
src
/
server
/
main.c
diff --git
a/src/server/main.c
b/src/server/main.c
index
6c2f691
..
c8be473
100644
(file)
--- a/
src/server/main.c
+++ b/
src/server/main.c
@@
-9,6
+9,7
@@
*/
#include <stdlib.h>
#include <stdio.h>
*/
#include <stdlib.h>
#include <stdio.h>
+#include <stdbool.h>
#include <string.h>
#include <signal.h>
#include "common.h"
#include <string.h>
#include <signal.h>
#include "common.h"
@@
-20,6
+21,7
@@
#include <syslog.h>
#include <pthread.h>
#include "../cokebank.h"
#include <syslog.h>
#include <pthread.h>
#include "../cokebank.h"
+#include "../common/config.h"
// === IMPORTS ===
extern void Init_Handlers(void);
// === IMPORTS ===
extern void Init_Handlers(void);
@@
-30,6
+32,7
@@
extern int giServer_Port;
extern const char *gsItemListFile;
extern const char *gsCoke_ModbusAddress;
extern const char *gsDoor_SerialPort;
extern const char *gsItemListFile;
extern const char *gsCoke_ModbusAddress;
extern const char *gsDoor_SerialPort;
+extern bool gbSyslogEnabled;
// === PROTOTYPES ===
void *Periodic_Thread(void *Unused);
// === PROTOTYPES ===
void *Periodic_Thread(void *Unused);
@@
-128,6
+131,7
@@
int main(int argc, char *argv[])
gsItemListFile = Config_GetValue("items_file", 0);
gbNoCostMode = (Config_GetValue_Bool("test_mode", 0) == 1);
gsItemListFile = Config_GetValue("items_file", 0);
gbNoCostMode = (Config_GetValue_Bool("test_mode", 0) == 1);
+ gbSyslogEnabled = (Config_GetValue_Bool("disable_syslog", 0) == 0);
signal(SIGINT, sigint_handler);
signal(SIGTERM, sigint_handler);
signal(SIGINT, sigint_handler);
signal(SIGTERM, sigint_handler);
@@
-231,7
+235,9
@@
int InitSerial(const char *File, int BaudRate)
case 1200: baud = B1200; break;
case 9600: baud = B9600; break;
case 115200: baud = B115200; break;
case 1200: baud = B1200; break;
case 9600: baud = B9600; break;
case 115200: baud = B115200; break;
- default: close(fd); return -1;
+ default:
+ fprintf(stderr, "ERROR: Invalid baud rate to InitSerial (%i)\n", BaudRate);
+ exit(1);
}
info.c_lflag = 0; // Non-Canoical, No Echo
}
info.c_lflag = 0; // Non-Canoical, No Echo
UCC
git Repository :: git.ucc.asn.au