mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: log: add __send_log_set_metadata_sd helper

Browse Source 
Extract sd metadata assignment in __send_log() to make an inline helper
function out of it in order to be able to use it from other functions if
needed.
This commit is contained in:
Aurelien DARRAGON 2024-05-23 15:58:59 +02:00
parent 3102c89dde
commit a6e38465fb
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/log.c
View File

@ -2774,6 +2774,15 @@ static inline void __do_send_log_backend(struct proxy *be, struct log_header hdr
_HA_ATOMIC_INC(&dropped_logs); _HA_ATOMIC_INC(&dropped_logs);
} }
static inline void __send_log_set_metadata_sd(struct ist *metadata, char *sd, size_t sd_size)
{
metadata[LOG_META_STDATA] = ist2(sd, sd_size);
/* Remove trailing space of structured data */
while (metadata[LOG_META_STDATA].len && metadata[LOG_META_STDATA].ptr[metadata[LOG_META_STDATA].len-1] == ' ')
metadata[LOG_META_STDATA].len--;
}
/* provided to low-level process_send_log() helper, may be NULL */ /* provided to low-level process_send_log() helper, may be NULL */
struct process_send_log_ctx { struct process_send_log_ctx {
struct session *sess; struct session *sess;
@ -2892,11 +2901,7 @@ static void __send_log(struct process_send_log_ctx *ctx,
metadata[LOG_META_PID] = ist2(pidstr, strlen(pidstr)); metadata[LOG_META_PID] = ist2(pidstr, strlen(pidstr));
} }
metadata[LOG_META_STDATA] = ist2(sd, sd_size); __send_log_set_metadata_sd(metadata, sd, sd_size);
/* Remove trailing space of structured data */
while (metadata[LOG_META_STDATA].len && metadata[LOG_META_STDATA].ptr[metadata[LOG_META_STDATA].len-1] == ' ')
metadata[LOG_META_STDATA].len--;
return process_send_log(ctx, loggers, level, -1, metadata, message, size); return process_send_log(ctx, loggers, level, -1, metadata, message, size);
} }