]> source.dussan.org Git - rspamd.git/commitdiff
[Fix] Do not use ephemeral string
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 3 Oct 2019 14:32:45 +0000 (15:32 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 3 Oct 2019 14:32:45 +0000 (15:32 +0100)
src/libserver/worker_util.c
src/rspamd.c

index 163b0a5090bc2575b90723ea6f06565146d07e1a..0b86001609bfa205ee7250fc185dc071662ed86d 100644 (file)
@@ -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,
index 8480f6c48354bf0ea78af0f9bb110a64a36bf4f8..39c38b053f7c6e61ed6e744d512cb1d7c56e43c6 100644 (file)
@@ -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;