This commit is contained in:
Олег Бородин
2025-10-16 00:08:31 +02:00
parent fc578f6e48
commit 05f845a444
5 changed files with 69 additions and 62 deletions
+3 -2
View File
@@ -36,13 +36,16 @@ int util_config(void) {
logger_dprintf("server config");
tconfig_t tconfig;
tconfig_init(&tconfig);
char* logpath = NULL;
tconfig_bind(&tconfig, TCONF_STR, "logpath", &logpath);
ssize_t rsize = tconfig_read(&tconfig, "helmet.conf");
int res = tconfig_parse(&tconfig);
MASSERT(res == -1);
tconfig_destroy(&tconfig);
@@ -56,5 +59,3 @@ int util_run(void) {
logger_dprintf("server start");
return 0;
}
+3
View File
@@ -28,6 +28,7 @@ int _main(int argc, char **argv) {
(void)argv;
tconfig_t tconfig;
tconfig_init(&tconfig);
int intkey = 0;
@@ -37,10 +38,12 @@ int _main(int argc, char **argv) {
tconfig_bind(&tconfig, TCONF_STR, "strkey", &strkey);
ssize_t rsize = tconfig_read(&tconfig, "helmet.conf");
printf("%ld\n", rsize);
MASSERT(rsize > 0);
int res = tconfig_parse(&tconfig);
MASSERT(res == -1);
tconfig_destroy(&tconfig);
+3 -1
View File
@@ -15,6 +15,7 @@ int logger_init(void) {
void logger_dprintf(char* message, ...) {
printf("debug: ");
va_list argptr;
va_start(argptr, message);
vprintf(message, argptr);
va_end(argptr);
@@ -24,6 +25,7 @@ void logger_dprintf(char* message, ...) {
void logger_iprintf(char* message, ...) {
printf("info: ");
va_list argptr;
va_start(argptr, message);
vprintf(message, argptr);
va_end(argptr);
@@ -33,9 +35,9 @@ void logger_iprintf(char* message, ...) {
void logger_wprintf(char* message, ...) {
printf("warning: ");
va_list argptr;
va_start(argptr, message);
vprintf(message, argptr);
va_end(argptr);
printf("\n");
}
+4 -2
View File
@@ -19,16 +19,20 @@ int server_config(void) {
logger_dprintf("server config");
tconfig_t tconfig;
tconfig_init(&tconfig);
char* logpath = NULL;
tconfig_bind(&tconfig, TCONF_STR, "logpath", &logpath);
ssize_t rsize = tconfig_read(&tconfig, "helmet.conf");
if (rsize < 0) {
return SERVER_CONFIG_ERROR;
}
int res = tconfig_parse(&tconfig);
if (res < 0) {
return SERVER_CONFIG_ERROR;
}
@@ -44,5 +48,3 @@ int server_run(void) {
logger_dprintf("server start");
return 0;
}
-1
View File
@@ -7,4 +7,3 @@ int server_config(void);
int server_run(void);
#endif