commit dda7c33: [Fix] Do not use ephemeral string
Vsevolod Stakhov
vsevolod at highsecure.ru
Thu Oct 3 15:00:07 UTC 2019
Author: Vsevolod Stakhov
Date: 2019-10-03 15:32:45 +0100
URL: https://github.com/rspamd/rspamd/commit/dda7c338939a30b61896e01c6a0e400f64d29814 (HEAD -> master)
[Fix] Do not use ephemeral string
---
src/libserver/worker_util.c | 4 ++--
src/rspamd.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index 163b0a509..0b8600160 100644
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -893,7 +893,7 @@ rspamd_fork_worker (struct rspamd_main *rspamd_main,
if (cf->bind_conf) {
setproctitle ("%s process (%s)", cf->worker->name,
- cf->bind_conf->bind_line);
+ cf->bind_conf->name);
}
else {
setproctitle ("%s process", cf->worker->name);
@@ -919,7 +919,7 @@ rspamd_fork_worker (struct rspamd_main *rspamd_main,
if (cf->bind_conf) {
msg_info_main ("starting %s process %P (%d); listen on: %s",
cf->worker->name,
- getpid (), index, cf->bind_conf->bind_line);
+ getpid (), index, cf->bind_conf->name);
}
else {
msg_info_main ("starting %s process %P (%d)", cf->worker->name,
diff --git a/src/rspamd.c b/src/rspamd.c
index 8480f6c48..39c38b053 100644
--- a/src/rspamd.c
+++ b/src/rspamd.c
@@ -584,7 +584,7 @@ spawn_workers (struct rspamd_main *rspamd_main, struct ev_loop *ev_base)
if (!cf->enabled || cf->count <= 0) {
msg_info_main ("worker of type %s(%s) is disabled in the config, "
"skip spawning", g_quark_to_string (cf->type),
- cf->bind_conf ? cf->bind_conf->bind_line : "none");
+ cf->bind_conf ? cf->bind_conf->name : "none");
cur = g_list_next (cur);
continue;
More information about the Commits
mailing list