pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-06-27 13:46:37 +02:00
Code Activity

Add $client.servername. Also add json_string_possibly_null() which is

Browse Source 
a wrapper that will return a 'null' JSON object for null strings and
otherwise a string object for non-NULL. It seems by default this is
not the case which is a bit annoying. Maybe we should re-wrap all
code to use this. We'll see.
The problem is when this is not done, then a $variable won't be
expanded and would show up like literally "$variable" as if the
variable was never passed on.
This commit is contained in:
Bram Matthys
2021-08-06 09:24:24 +02:00
parent 5b44baab1f
commit cfccc8f05c
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/log.c
+11 -1
View File
@@ -32,6 +32,13 @@
long log_to_snomask(LogLevel loglevel, char *subsystem, char *event_id);
void do_unreal_log_internal(LogLevel loglevel, char *subsystem, char *event_id, Client *client, int expand_msg, char *msg, va_list vl);
json_t *json_string_possibly_null(char *s)
{
if (s)
return json_string(s);
return json_null();
}
LogType log_type_stringtoval(char *str)
{
if (!strcmp(str, "json"))
@@ -226,7 +233,7 @@ void json_expand_client(json_t *j, char *key, Client *client, int detail)
else
json_object_set_new(child, "host", json_string(GetIP(client)));
json_object_set_new(child, "ip", json_string(GetIP(client)));
json_object_set_new(child, "ip", json_string_possibly_null(client->ip));
if (client->user)
{
@@ -242,6 +249,9 @@ void json_expand_client(json_t *j, char *key, Client *client, int detail)
if (*client->info)
json_object_set_new(child, "info", json_string(client->info));
if (client->srvptr && client->srvptr->name)
json_object_set_new(child, "servername", json_string(client->srvptr->name));
if (IsLoggedIn(client))
json_object_set_new(child, "account", json_string(client->user->svid));
}