pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-10 01:23:13 +02:00
Code Activity

Add check for missing include "snomasks.default.conf";

Browse Source 
Well, not literally, but indirectly :D
This commit is contained in:
Bram Matthys
2021-09-24 17:44:57 +02:00
parent f85732a7e0
commit efb16159f3
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/h.h
+1
View File
@@ -1123,6 +1123,7 @@ extern LogData *log_data_socket_error(int fd);
extern LogData *log_data_link_block(ConfigItem_link *link);
extern LogData *log_data_tkl(const char *key, TKL *tkl);
extern LogData *log_data_tls_error(void);
extern int log_tests(void);
extern void log_blocks_switchover(void);
extern void postconf_defaults_log_block(void);
extern LogLevel log_level_stringtoval(const char *str);
src/conf.c
+1 -1
View File
@@ -1936,7 +1936,7 @@ void config_test_reset(void)
int config_test_all(void)
{
if ((config_test_blocks() < 0) || (callbacks_check() < 0) || (efunctions_check() < 0) ||
reloadable_perm_module_unloaded() || !tls_tests())
reloadable_perm_module_unloaded() || !tls_tests() || !log_tests())
{
return 0;
}
src/log.c
+25 -9
View File
@@ -33,6 +33,7 @@
/* Variables */
Log *logs[NUM_LOG_DESTINATIONS] = { NULL, NULL, NULL, NULL, NULL };
Log *temp_logs[NUM_LOG_DESTINATIONS] = { NULL, NULL, NULL, NULL, NULL };
static int snomask_num_destinations = 0;
/* Forward declarations */
int log_sources_match(LogSource *logsource, LogLevel loglevel, const char *subsystem, const char *event_id, int matched_already);
@@ -180,6 +181,7 @@ int config_test_log(ConfigFile *conf, ConfigEntry *block)
if (!strcmp(cep->name, "snomask"))
{
destinations++;
snomask_num_destinations++;
/* We need to validate the parameter here as well */
if (!cep->value)
{
@@ -1658,20 +1660,25 @@ void free_log_block(Log *l)
}
}
void log_blocks_switchover(void)
{
int i;
for (i=0; i < NUM_LOG_DESTINATIONS; i++)
free_log_block(logs[i]);
memcpy(logs, temp_logs, sizeof(logs));
memset(temp_logs, 0, sizeof(temp_logs));
}
/* TODO: if logging to the same file from multiple log { }
* blocks, then we would have opened the file twice.
* Better to use an extra layer to keep track of files.
*/
int log_tests(void)
{
if (snomask_num_destinations <= 1)
{
unreal_log(ULOG_ERROR, "config", "LOG_SNOMASK_BLOCK_MISSING", NULL,
"Missing log blocks with snomask configuration.\n"
"Please add the following line to your unrealircd.conf: "
"include \"snomasks.default.conf\";");
return 0;
}
snomask_num_destinations = 0;
return 1;
}
void postconf_defaults_log_block(void)
{
Log *l;
@@ -1711,3 +1718,12 @@ void postconf_defaults_log_block(void)
AppendListItem(ls, l->sources);
ls = add_log_source("!kick.REMOTE_CLIENT_KICK");
}
void log_blocks_switchover(void)
{
int i;
for (i=0; i < NUM_LOG_DESTINATIONS; i++)
free_log_block(logs[i]);
memcpy(logs, temp_logs, sizeof(logs));
memset(temp_logs, 0, sizeof(temp_logs));
}