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

Add link to https://www.unrealircd.org/docs/Log_block#Logging_to_a_channel

Browse Source 
in the release notes.
Also add the sub-options: color, json-message-tag and oper-only.
This commit is contained in:
Bram Matthys
2021-12-30 10:40:01 +01:00
parent eaded2d12f
commit 0f52ff76e8
3 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/RELEASE-NOTES.md
+3
View File
@@ -4,6 +4,9 @@ UnrealIRCd 6.0.2-git
You are looking at the git version of UnrealIRCd, bleeding edge.
Enhancements:
* Support for [logging to a channel](https://www.unrealircd.org/docs/Log_block#Logging_to_a_channel).
Similar to snomasks but then for channels.
UnrealIRCd 6.0.1.1
-------------------
include/struct.h
+6 -1
View File
@@ -263,12 +263,17 @@ typedef struct Log Log;
struct Log {
Log *prev, *next;
LogSource *sources;
int type;
char destination[CHANNELLEN+1];
/* for destination::file */
char *file;
char *filefmt;
long maxsize;
int type;
int logfd;
/* for destination::channel */
int color;
int json_message_tag;
int oper_only;
};
/** This is used for deciding the <index> in logs[<index>] and temp_logs[<index>] */
src/log.c
+33 -5
View File
@@ -225,6 +225,20 @@ int config_test_log(ConfigFile *conf, ConfigEntry *block)
cep->file->filename, cep->line_number, cep->value);
errors++;
}
for (cepp = cep->items; cepp; cepp = cepp->next)
{
if (!strcmp(cepp->name, "color"))
;
else if (!strcmp(cepp->name, "json-message-tag"))
;
else if (!strcmp(cepp->name, "oper-only"))
;
else
{
config_error_unknown(cepp->file->filename, cepp->line_number, "log::destination::channel", cepp->name);
errors++;
}
}
} else
if (!strcmp(cep->name, "file"))
{
@@ -397,6 +411,20 @@ int config_run_log(ConfigFile *conf, ConfigEntry *block)
strlcpy(log->destination, cep->value, sizeof(log->destination)); /* destination is the channel */
log->sources = sources;
AddListItem(log, temp_logs[LOG_DEST_CHANNEL]);
/* set defaults */
log->color = tempiConf.server_notice_colors;
log->json_message_tag = 1;
log->oper_only = 1;
/* now parse options (if any) */
for (cepp = cep->items; cepp; cepp = cepp->next)
{
if (!strcmp(cepp->name, "color"))
log->color = config_checkval(cepp->value, CFG_YESNO);
else if (!strcmp(cepp->name, "json-message-tag"))
log->json_message_tag = config_checkval(cepp->value, CFG_YESNO);
else if (!strcmp(cepp->name, "oper-only"))
log->oper_only = config_checkval(cepp->value, CFG_YESNO);
}
} else
if (!strcmp(cep->name, "remote"))
{
@@ -1532,7 +1560,6 @@ void do_unreal_log_channels(LogLevel loglevel, const char *subsystem, const char
for (l = logs[LOG_DEST_CHANNEL]; l; l = l->next)
{
int colors = iConf.server_notice_colors;
const char *operlogin;
ConfigItem_oper *oper;
Channel *channel;
@@ -1540,8 +1567,6 @@ void do_unreal_log_channels(LogLevel loglevel, const char *subsystem, const char
if (!log_sources_match(l->sources, loglevel, subsystem, event_id, 0))
continue;
// TODO: allow option to override 'colors' on a per-channel basis?
channel = find_channel(l->destination);
if (!channel)
continue;
@@ -1551,9 +1576,12 @@ void do_unreal_log_channels(LogLevel loglevel, const char *subsystem, const char
Client *client = m->client;
if (!MyUser(client))
continue;
if (!IsOper(client)) // TODO: allow config option for unsafe
if (l->oper_only && !IsOper(client))
continue;
sendto_log(client, "PRIVMSG", channel->name, colors, loglevel, subsystem, event_id, msg, json_serialized, from_server);
sendto_log(client, "PRIVMSG", channel->name, l->color,
loglevel, subsystem, event_id, msg,
l->json_message_tag ? json_serialized : NULL,
from_server);
}
}
}