sr-dev April 2024

sr-dev@lists.kamailio.org

12 participants
254 discussions

git:master:30f620ae: sdpops: use find_sdp_line_start() to find start of attribute line
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 30f620ae2254888c0d8d7edc375cb312e33de124 URL: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T08:23:29+02:00 sdpops: use find_sdp_line_start() to find start of attribute line --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… Patch: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 30de5dfc543..f40062420a7 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2059,6 +2059,9 @@ int bind_sdpops(struct sdpops_binds *sob) return 0; } +/** + * + */ int sdpops_attr_val(str *payload, str *attr, str *val) { char *sline; @@ -2066,16 +2069,9 @@ int sdpops_attr_val(str *payload, str *attr, str *val) val->s = NULL; val->len = 0; - sline = find_sdp_line(payload->s, payload->s + payload->len, attr->s[0]); + sline = find_sdp_line_start( + payload->s, payload->s + payload->len, attr->s[0], 0); while(sline != NULL) { - /* check start of line */ - if(sline > payload->s) { - if(eline[-1] != '\n' && eline[-1] != '\r') { - sline = find_next_sdp_line( - sline, payload->s + payload->len, attr->s[0], NULL); - continue; - } - } /* find EoL or EoData */ eline = sline; while(eline < payload->s + payload->len) {

1 0

git:master:368661cc: core: parser/sdp - function to find sdp line with start EoL check option
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 368661cc15251af4cbf295d1f5fad5a42d1b647b URL: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T08:10:11+02:00 core: parser/sdp - function to find sdp line with start EoL check option --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c Modified: src/core/parser/sdp/sdp_helpr_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… Patch: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index d5cb359b40f..a5dffd9c398 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -733,9 +733,10 @@ int extract_sess_version(str *oline, str *sess_version) /* * Auxiliary for some functions. + * - smode: if 1, pstart is pointing inside msg body * Returns pointer to first character of found line, or NULL if no such line. */ -char *find_sdp_line(char *pstart, char *plimit, char linechar) +char *find_sdp_line_start(char *pstart, char *plimit, char linechar, int smode) { static char linehead[3] = "x="; char *cp, *cp1; @@ -749,11 +750,14 @@ char *find_sdp_line(char *pstart, char *plimit, char linechar) if(cp1 == NULL) return NULL; /* - * As it is body, we assume it has previous line and we can - * lookup previous character. + * smode==1 means it is msg body, thus it has previous line and it can + * lookup previous character even when cp1==pstart. */ - if(cp1[-1] == '\n' || cp1[-1] == '\r') - return cp1; + if(cp1 > pstart || smode == 1) { + if(cp1[-1] == '\n' || cp1[-1] == '\r') { + return cp1; + } + } /* * Having such data, but not at line beginning. * Skip them and reiterate. ser_memmem() will find next @@ -765,6 +769,14 @@ char *find_sdp_line(char *pstart, char *plimit, char linechar) } } +/* + * Auxiliary for some functions - expect pstart to point inside SIP message body. + * Returns pointer to first character of found line, or NULL if no such line. + */ +char *find_sdp_line(char *pstart, char *plimit, char linechar) +{ + return find_sdp_line_start(pstart, plimit, linechar, 1); +} /* This function assumes pstart points to a line of requested type. */ char *find_next_sdp_line( diff --git a/src/core/parser/sdp/sdp_helpr_funcs.h b/src/core/parser/sdp/sdp_helpr_funcs.h index e8ce6f7e60a..20d3ebd882d 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.h +++ b/src/core/parser/sdp/sdp_helpr_funcs.h @@ -65,6 +65,7 @@ int extract_accept_wrapped_types(str *body, str *accept_wrapped_types); int extract_max_size(str *body, str *max_size); int extract_path(str *body, str *path); +char *find_sdp_line_start(char *pstart, char *plimit, char linechar, int smode); char *find_sdp_line(char *p, char *plimit, char linechar); char *find_next_sdp_line(char *p, char *plimit, char linechar, char *defptr);

1 0

git:master:b03ec735: core: parser/sdp - rename parameter to suggest better its role
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: b03ec73589c12e566b11ce2c653401daa915c805 URL: https://github.com/kamailio/kamailio/commit/b03ec73589c12e566b11ce2c653401d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T07:54:12+02:00 core: parser/sdp - rename parameter to suggest better its role --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b03ec73589c12e566b11ce2c653401d… Patch: https://github.com/kamailio/kamailio/commit/b03ec73589c12e566b11ce2c653401d… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index b15ddeaa4bd..d5cb359b40f 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -735,14 +735,13 @@ int extract_sess_version(str *oline, str *sess_version) * Auxiliary for some functions. * Returns pointer to first character of found line, or NULL if no such line. */ - -char *find_sdp_line(char *p, char *plimit, char linechar) +char *find_sdp_line(char *pstart, char *plimit, char linechar) { static char linehead[3] = "x="; char *cp, *cp1; linehead[0] = linechar; /* Iterate through body */ - cp = p; + cp = pstart; for(;;) { if(cp >= plimit) return NULL; @@ -767,13 +766,14 @@ char *find_sdp_line(char *p, char *plimit, char linechar) } -/* This function assumes p points to a line of requested type. */ -char *find_next_sdp_line(char *p, char *plimit, char linechar, char *defptr) +/* This function assumes pstart points to a line of requested type. */ +char *find_next_sdp_line( + char *pstart, char *plimit, char linechar, char *defptr) { char *t; - if(p >= plimit || plimit - p < 3) + if(pstart >= plimit || plimit - pstart < 3) return defptr; - t = find_sdp_line(p + 2, plimit, linechar); + t = find_sdp_line(pstart + 2, plimit, linechar); return t ? t : defptr; }

1 0

git:master:57dd65c2: xhttp_prom: use proper prefix for pkg stats
by Ovidiu Sas 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 57dd65c2c6abd520c0db876aca6bd2238229e187 URL: https://github.com/kamailio/kamailio/commit/57dd65c2c6abd520c0db876aca6bd22… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-04T16:22:39Z xhttp_prom: use proper prefix for pkg stats --- Modified: src/modules/xhttp_prom/prom.c --- Diff: https://github.com/kamailio/kamailio/commit/57dd65c2c6abd520c0db876aca6bd22… Patch: https://github.com/kamailio/kamailio/commit/57dd65c2c6abd520c0db876aca6bd22… --- diff --git a/src/modules/xhttp_prom/prom.c b/src/modules/xhttp_prom/prom.c index 1ea7edb1c5e..786a2c3e40a 100644 --- a/src/modules/xhttp_prom/prom.c +++ b/src/modules/xhttp_prom/prom.c @@ -221,8 +221,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) for(; i < pkg_proc_stats_no; i++) { if(prom_body_printf(ctx, - "kamailio_pkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " + "%.*spkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " "%d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].used, ts) == -1) { @@ -230,8 +231,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_available{pid=\"%u\", rank=\"%d\", " + "%.*spkgmem_available{pid=\"%u\", rank=\"%d\", " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].available, ts) == -1) { @@ -239,8 +241,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_real_used{pid=\"%u\", rank=\"%d\", " + "%.*spkgmem_real_used{pid=\"%u\", rank=\"%d\", " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].real_used, ts) == -1) { @@ -248,8 +251,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_total_frags{pid=\"%u\", rank=\"%d\", " + "%.*spkgmem_total_frags{pid=\"%u\", rank=\"%d\", " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_frags, ts) == -1) { @@ -257,8 +261,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_total_size{pid=\"%u\", rank=\"%d\" " + "%.*spkgmem_total_size{pid=\"%u\", rank=\"%d\" " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_size, ts) == -1) {

1 0

git:master:c4b81393: sdpops: function to parse path for sdp content
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: c4b81393fed9a333af9349850e70ee377f3f3491 URL: https://github.com/kamailio/kamailio/commit/c4b81393fed9a333af9349850e70ee3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T16:29:05+02:00 sdpops: function to parse path for sdp content --- Added: src/modules/sdpops/sdpops_path.c Added: src/modules/sdpops/sdpops_path.h --- Diff: https://github.com/kamailio/kamailio/commit/c4b81393fed9a333af9349850e70ee3… Patch: https://github.com/kamailio/kamailio/commit/c4b81393fed9a333af9349850e70ee3…

1 0

git:master:359a442e: sdpops: reformat the codecs map
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 359a442e14a156b0bcf60dc5b2580cbc57924e34 URL: https://github.com/kamailio/kamailio/commit/359a442e14a156b0bcf60dc5b2580cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T16:29:05+02:00 sdpops: reformat the codecs map --- Modified: src/modules/sdpops/sdpops_data.c --- Diff: https://github.com/kamailio/kamailio/commit/359a442e14a156b0bcf60dc5b2580cb… Patch: https://github.com/kamailio/kamailio/commit/359a442e14a156b0bcf60dc5b2580cb… --- diff --git a/src/modules/sdpops/sdpops_data.c b/src/modules/sdpops/sdpops_data.c index 25d7de178ed..c158511b60e 100644 --- a/src/modules/sdpops/sdpops_data.c +++ b/src/modules/sdpops/sdpops_data.c @@ -91,19 +91,29 @@ Registration Procedures: Standards Action Process or expert approval */ -typedef struct _codecsmap -{ +/* clang-format off */ +typedef struct _codecsmap { str name; str ids; } codecsmap_t; -codecsmap_t sdpops_codecsmap_table[] = {{{"PCMU", 4}, {"0", 1}}, - {{"GSM", 3}, {"3", 1}}, {{"G723", 4}, {"4", 1}}, - {{"DVI4", 4}, {"5,6,16,17", 9}}, {{"LPC", 3}, {"7", 1}}, - {{"PCMA", 4}, {"8", 1}}, {{"G722", 4}, {"9", 1}}, - {{"L16", 3}, {"10,11", 5}}, {{"QCELP", 5}, {"12", 2}}, - {{"CN", 2}, {"13", 5}}, {{"MPA", 3}, {"14", 2}}, - {{"G728", 4}, {"15", 2}}, {{"G729", 4}, {"18", 2}}, {{0, 0}, {0, 0}}}; +codecsmap_t sdpops_codecsmap_table[] = { + {{"PCMU", 4}, {"0", 1}}, + {{"GSM", 3}, {"3", 1}}, + {{"G723", 4}, {"4", 1}}, + {{"DVI4", 4}, {"5,6,16,17", 9}}, + {{"LPC", 3}, {"7", 1}}, + {{"PCMA", 4}, {"8", 1}}, + {{"G722", 4}, {"9", 1}}, + {{"L16", 3}, {"10,11", 5}}, + {{"QCELP", 5}, {"12", 2}}, + {{"CN", 2}, {"13", 5}}, + {{"MPA", 3}, {"14", 2}}, + {{"G728", 4}, {"15", 2}}, + {{"G729", 4}, {"18", 2}}, + {{0, 0}, {0, 0}} +}; +/* clang-format on */ /** * set the string with the IDs mapped to codec name

1 0

git:master:d0d4f589: modules: readme files regenerated - xhttp_prom ... [skip ci]
by Kamailio Dev 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: d0d4f58920669f280d80c6cd66578a4b68db9e43 URL: https://github.com/kamailio/kamailio/commit/d0d4f58920669f280d80c6cd66578a4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-04T16:16:11+02:00 modules: readme files regenerated - xhttp_prom ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/d0d4f58920669f280d80c6cd66578a4… Patch: https://github.com/kamailio/kamailio/commit/d0d4f58920669f280d80c6cd66578a4…

1 0

git:master:a55967c0: xhttp_prom: update documentation
by Ovidiu Sas 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: a55967c0e8cee184f1cc8cc0c5df4635041b88d1 URL: https://github.com/kamailio/kamailio/commit/a55967c0e8cee184f1cc8cc0c5df463… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-04T10:10:15-04:00 xhttp_prom: update documentation --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a55967c0e8cee184f1cc8cc0c5df463… Patch: https://github.com/kamailio/kamailio/commit/a55967c0e8cee184f1cc8cc0c5df463… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index e1f2709dd21..83cede92633 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -178,6 +178,29 @@ modparam("xhttp_prom", "xhttp_prom_stats", "200_replies") # Do not display internal &kamailio; statistics. This is the default option. modparam("xhttp_prom", "xhttp_prom_stats", "") +... + </programlisting> + </example> + </section> + <section id="xhttp_prom.p.xhttp_prom_pkg_stats"> + <title><varname>xhttp_prom_pkg_stats</varname> (str)</title> + <para> + Enable or disable internal &kamailio; pkg memory statistics. + </para> + <para> + <emphasis>If not 0</emphasis>, pkg memory statistics will be displayed. + </para> + <para> + <emphasis> + Default value is 0 (no pkg memory statistics). + </emphasis> + </para> + <example> + <title>Set <varname>xhttp_prom_pkg_stats</varname> parameter</title> + <programlisting format="linespecific"> +... +# enable pkg stats +modparam("xhttp_prom", "xhttp_prom_pkg_stats", 1) ... </programlisting> </example>

1 0

[kamailio/kamailio] core: dprint - include time in stderr json log (PR #3795)
by Alexander Bakker 04 Apr '24

04 Apr '24

#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This patch introduces a new "time" field for JSON logging to stderr. The CEE format already includes this field, but the Kamailio-specific format doesn't. If you need timestamps in your structured logs, but don't want to use the CEE format due to its limitations, this patch'd give you the best of both worlds. I know this comes a little out of the blue, so any feedback is welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3795 -- Commit Summary -- * core: dprint - include time in stderr json log -- File Changes -- M src/core/dprint.c (44) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3795.patch https://github.com/kamailio/kamailio/pull/3795.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3795 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3795(a)github.com>

2 2

git:master:c3e8860f: core: dprint - include time in stderr json log
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: c3e8860f00ca1d4618b8d2ce986b5d5c3eb9a9d3 URL: https://github.com/kamailio/kamailio/commit/c3e8860f00ca1d4618b8d2ce986b5d5… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T13:21:54+02:00 core: dprint - include time in stderr json log This patch introduces a new "time" field for JSON logging to stderr. The CEE format already includes this field, but the Kamailio-specific format doesn't. If you need timestamps in your structured logs, but don't want to use the CEE format due to its limitations, this patch'd give you the best of both worlds. --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/c3e8860f00ca1d4618b8d2ce986b5d5… Patch: https://github.com/kamailio/kamailio/commit/c3e8860f00ca1d4618b8d2ce986b5d5… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 724d3445370..83d1e30f3ca 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -573,31 +573,31 @@ static int _ksr_slog_json_flags = 0; ".callid\": \"%.*s\"%s%s%.*s%s," \ " \"%smessage\": %s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_FMT \ - "{ \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ - " \"module\": \"%s\", \"file\": \"%s\"," \ - " \"line\": %d, \"function\": \"%s\"%.*s%s%s%.*s%s, \"%smessage\": " \ +#define KSR_SLOG_STDERR_JSON_FMT \ + "{ \"time\": \"%s.%09luZ\", \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ + " \"module\": \"%s\", \"file\": \"%s\"," \ + " \"line\": %d, \"function\": \"%s\"%.*s%s%s%.*s%s, \"%smessage\": " \ "%s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_CFMT \ - "{ \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ - " \"module\": \"%s\", \"file\": \"%s\"," \ - " \"line\": %d, \"function\": \"%s\", \"callid\": \"%.*s\"%s%s%.*s%s, " \ +#define KSR_SLOG_STDERR_JSON_CFMT \ + "{ \"time\": \"%s.%09luZ\", \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ + " \"module\": \"%s\", \"file\": \"%s\"," \ + " \"line\": %d, \"function\": \"%s\", \"callid\": \"%.*s\"%s%s%.*s%s, " \ "\"%smessage\": %s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_PFMT \ - "{ \"" NAME ".idx\": %d, \"" NAME ".pid\": %d, \"" NAME \ - ".level\": \"%s\"," \ - " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ - " \"" NAME ".line\": %d, \"" NAME \ +#define KSR_SLOG_STDERR_JSON_PFMT \ + "{ \"" NAME ".time\": \"%s.%09luZ\", \"" NAME ".idx\": %d, \"" NAME \ + ".pid\": %d, \"" NAME ".level\": \"%s\"," \ + " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ + " \"" NAME ".line\": %d, \"" NAME \ ".function\": \"%s\"%.*s\"%s%s%.*s%s, \"%smessage\": %s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_CPFMT \ - "{ \"" NAME ".idx\": %d, \"" NAME ".pid\": %d, \"" NAME \ - ".level\": \"%s\"," \ - " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ - " \"" NAME ".line\": %d, \"" NAME ".function\": \"%s\", \"" NAME \ - ".callid\": \"%.*s\"%s%s%.*s%s," \ +#define KSR_SLOG_STDERR_JSON_CPFMT \ + "{ \"" NAME ".time\": \"%s.%09luZ\", \"" NAME ".idx\": %d, \"" NAME \ + ".pid\": %d, \"" NAME ".level\": \"%s\"," \ + " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ + " \"" NAME ".line\": %d, \"" NAME ".function\": \"%s\", \"" NAME \ + ".callid\": \"%.*s\"%s%s%.*s%s," \ " \"%smessage\": %s%.*s%s }%s" #ifdef HAVE_PTHREAD @@ -735,9 +735,9 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) } else { if(unlikely(log_color)) dprint_color(kld->v_level); - fprintf(stderr, efmt, process_no, my_pid(), kld->v_lname, - kld->v_mname, kld->v_fname, kld->v_fline, kld->v_func, - LOGV_CALLID_LEN, LOGV_CALLID_STR, prname, pmb, + fprintf(stderr, efmt, iso8601buf, _tp.tv_nsec, process_no, my_pid(), + kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, + kld->v_func, LOGV_CALLID_LEN, LOGV_CALLID_STR, prname, pmb, LOGV_PREFIX_LEN, LOGV_PREFIX_STR, pme, prefmsg, smb, s_out.len, s_out.s, sme, (_ksr_slog_json_flags & KSR_SLOGJSON_FL_NOLOGNL) ? ""

1 0

← Newer
1
...
18
19
20
21
22
23
24
25
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2024