Skip to content

Commit a940151

Browse files
logging: expose missing level filter param for event consumer
1 parent 94acb11 commit a940151

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

cfg.lex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ SYSLOG_ENABLED syslog_enabled
215215
LOG_EVENT_ENABLED log_event_enabled
216216
STDERROR_LEVEL_FILTER stderror_level_filter
217217
SYSLOG_LEVEL_FILTER syslog_level_filter
218+
LOG_EVENT_LEVEL_FILTER log_event_level_filter
218219
STDERROR_FORMAT stderror_log_format
219220
SYSLOG_FORMAT syslog_log_format
220221
LOG_JSON_BUF_SIZE "log_json_buf_size"
@@ -435,6 +436,7 @@ SPACE [ ]
435436
<INITIAL>{LOG_EVENT_ENABLED} { yylval.strval=yytext; return LOG_EVENT_ENABLED; }
436437
<INITIAL>{STDERROR_LEVEL_FILTER} { count(); yylval.strval=yytext; return STDERROR_LEVEL_FILTER; }
437438
<INITIAL>{SYSLOG_LEVEL_FILTER} { count(); yylval.strval=yytext; return SYSLOG_LEVEL_FILTER; }
439+
<INITIAL>{LOG_EVENT_LEVEL_FILTER} { count(); yylval.strval=yytext; return LOG_EVENT_LEVEL_FILTER; }
438440
<INITIAL>{STDERROR_FORMAT} { count(); yylval.strval=yytext; return STDERROR_FORMAT; }
439441
<INITIAL>{SYSLOG_FORMAT} { count(); yylval.strval=yytext; return SYSLOG_FORMAT; }
440442
<INITIAL>{LOG_JSON_BUF_SIZE} { count(); yylval.strval=yytext;

cfg.y

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ extern int cfg_parse_only_routes;
294294
%token LOG_EVENT_ENABLED
295295
%token STDERROR_LEVEL_FILTER
296296
%token SYSLOG_LEVEL_FILTER
297+
%token LOG_EVENT_LEVEL_FILTER
297298
%token STDERROR_FORMAT
298299
%token SYSLOG_FORMAT
299300
%token LOG_JSON_BUF_SIZE
@@ -944,6 +945,9 @@ assign_stm: LOGLEVEL EQUAL snumber { IFOR();
944945
set_log_consumer_level_filter(&s_tmp, $3);
945946
}
946947
| SYSLOG_LEVEL_FILTER EQUAL error { yyerror("number expected"); }
948+
| LOG_EVENT_LEVEL_FILTER EQUAL NUMBER { IFOR();
949+
log_event_level_filter = $3; }
950+
| LOG_EVENT_LEVEL_FILTER EQUAL error { yyerror("number expected"); }
947951
| STDERROR_FORMAT EQUAL STRING { IFOR();
948952
s_tmp.s = $3;
949953
s_tmp.len = strlen($3);

dprint.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ struct log_consumer_t *log_consumers = default_log_consumers;
8787
int log_consumers_no = 2;
8888

8989
int log_event_enabled = 0;
90+
int log_event_level_filter = 0;
9091
static str evi_log_name = str_init("E_CORE_LOG");
9192
static event_id_t evi_log_id;
9293

@@ -710,7 +711,8 @@ int init_log_event_cons(void)
710711
return -1;
711712
}
712713

713-
if (register_log_consumer(EVENT_CONSUMER_NAME, event_dprint, 0, 1) < 0) {
714+
if (register_log_consumer(EVENT_CONSUMER_NAME, event_dprint,
715+
log_event_level_filter, 1) < 0) {
714716
LM_ERR("Failed to register 'event' log consumer\n");
715717
return -1;
716718
}

dprint.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ extern int log_facility;
132132
extern char* log_name;
133133
extern char ctime_buf[];
134134
extern enum log_format stderr_log_format, syslog_log_format;
135+
extern int log_event_level_filter;
135136
extern int log_json_buf_size;
136137
extern int log_msg_buf_size;
137138

0 commit comments

Comments
 (0)