[sr-dev] git:master:88e5f613: xlog: add prefix_mode

[lazedo]

Module: kamailio
Branch: master
Commit: 88e5f6130a26f37e4e5dfa515ef640443bbc6873
URL: https://github.com/kamailio/kamailio/commit/88e5f6130a26f37e4e5dfa515ef640443bbc6873

Author: Luis Azedo <luis.azedo at factorlusitano.com>
Committer: lazedo <luis.azedo at factorlusitano.com>
Date: 2021-09-07T12:11:47+01:00

xlog: add prefix_mode

allows pv_format specifier in prefix param

---

Modified: src/modules/xlog/doc/xlog_admin.xml
Modified: src/modules/xlog/xlog.c

---

Diff:  https://github.com/kamailio/kamailio/commit/88e5f6130a26f37e4e5dfa515ef640443bbc6873.diff
Patch: https://github.com/kamailio/kamailio/commit/88e5f6130a26f37e4e5dfa515ef640443bbc6873.patch

---

diff --git a/src/modules/xlog/doc/xlog_admin.xml b/src/modules/xlog/doc/xlog_admin.xml
index 3a6b029c6e..3fcda4c105 100644
--- a/src/modules/xlog/doc/xlog_admin.xml
+++ b/src/modules/xlog/doc/xlog_admin.xml
@@ -165,6 +165,28 @@ modparam("xlog", "long_format", 1)
 ...
 modparam("xlog", "prefix", "-xlog: ")
 ...
+</programlisting>
+		</example>
+	</section>
+	<section id="xlog.p.varname">
+		<title><varname>prefix_mode</varname> (str)</title>
+		<para>
+		control behaviour of <varname>prefix</varname> value.
+		if mode = 0 then <varname>prefix</varname> is treated as string (current behaviour).
+		if mode = 1 then <varname>prefix</varname> is treated as pv_format specifier and value will be evaluated before output.
+		</para>
+		<para>
+		<emphasis>
+			Default value is 0.
+		</emphasis>
+		</para>
+		<example>
+		<title>Set <varname>prefix_mode</varname> parameter</title>
+		<programlisting format="linespecific">
+...
+modparam("xlog", "prefix", "$cfg(name):$cfg(line)")
+modparam("xlog", "prefix_mode", 1)
+...
 </programlisting>
 		</example>
 	</section>
diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c
index ed167d80ba..ea05e51833 100644
--- a/src/modules/xlog/xlog.c
+++ b/src/modules/xlog/xlog.c
@@ -60,6 +60,9 @@ MODULE_VERSION
 
 char *_xlog_buf = NULL;
 char *_xlog_prefix = "<script>: ";
+int _xlog_prefix_mode = 0;
+char *_xlog_prefix_buf = NULL;
+pv_elem_t *_xlog_prefix_pvs = NULL;
 
 /** parameters */
 static int buf_size=4096;
@@ -170,6 +173,7 @@ static param_export_t params[]={
 	{"log_facility", PARAM_STRING, &xlog_facility_name},
 	{"log_colors",   PARAM_STRING|USE_FUNC_PARAM, (void*)xlog_log_colors_param},
 	{"methods_filter",  PARAM_INT, &xlog_default_cfg.methods_filter},
+	{"prefix_mode",     INT_PARAM, &_xlog_prefix_mode},
 	{0,0,0}
 };
 
@@ -215,6 +219,27 @@ static int mod_init(void)
 		PKG_MEM_ERROR;
 		return -1;
 	}
+
+	if (_xlog_prefix_mode) {
+		str s;
+		s.s = _xlog_prefix;
+		s.len = strlen(s.s);
+
+		if(pv_parse_format(&s, &_xlog_prefix_pvs)<0)
+		{
+			LM_ERR("wrong format[%s]\n", s.s);
+			return -1;
+		}
+
+		_xlog_prefix_buf = (char*)pkg_malloc((buf_size+1)*sizeof(char));
+		if(_xlog_prefix_buf==NULL)
+		{
+			PKG_MEM_ERROR;
+			return -1;
+		}
+
+	}
+
 	return 0;
 }
 
@@ -222,12 +247,23 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm,
 		int level, int line, int facility)
 {
 	str txt;
+	char * _xlog_prefix_val = _xlog_prefix;
 
 	txt.len = buf_size;
+	txt.s = _xlog_buf;
 
 	if(xl_print_log(msg, xm->m, _xlog_buf, &txt.len)<0)
 		return -1;
-	txt.s = _xlog_buf;
+
+	if (_xlog_prefix_mode) {
+		str _xlog_prefix_str;
+		_xlog_prefix_str.s = _xlog_prefix_buf;
+		_xlog_prefix_str.len = buf_size;
+		if(pv_printf(msg, _xlog_prefix_pvs, _xlog_prefix_str.s, &_xlog_prefix_str.len) == 0 && _xlog_prefix_str.len > 0) {
+			_xlog_prefix_val = _xlog_prefix_buf;
+		}
+	}
+
 	/* if facility is not explicitely defined use the xlog default facility */
 	if (facility==NOFACILITY) {
 		facility = xlog_facility;
@@ -235,7 +271,7 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm,
 
 	if(line>0)
 		if(long_format==1)
-			LOG_FN(facility, level, _xlog_prefix,
+			LOG_FN(facility, level, _xlog_prefix_val,
 				"%s:%d:%.*s",
 				(xm->a)?(((xm->a->cfile)?xm->a->cfile:"")):"",
 				(xm->a)?xm->a->cline:0, txt.len, txt.s);
@@ -243,7 +279,7 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm,
 			LOG_FN(facility, level, _xlog_prefix,
 				"%d:%.*s", (xm->a)?xm->a->cline:0, txt.len, txt.s);
 	else
-		LOG_FN(facility, level, _xlog_prefix,
+		LOG_FN(facility, level, _xlog_prefix_val,
 			"%.*s", txt.len, txt.s);
 	return 1;
 }
@@ -488,6 +524,10 @@ static void destroy(void)
 {
 	if(_xlog_buf)
 		pkg_free(_xlog_buf);
+	if(_xlog_prefix_buf)
+		pkg_free(_xlog_prefix_buf);
+	if(_xlog_prefix_pvs)
+		pv_elem_free_all(_xlog_prefix_pvs);
 }
 
 static int xdbg_fixup_helper(void** param, int param_no, int mode)