From: Timo Sirainen Date: Mon, 20 Apr 2020 18:45:06 +0000 (+0300) Subject: lib-master, global: master_service_init_log() - Remove prefix parameter X-Git-Tag: 2.3.11.2~182 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fdd4d9c87c6295b88b9b1cdd2970ae5cd5d392d;p=thirdparty%2Fdovecot%2Fcore.git lib-master, global: master_service_init_log() - Remove prefix parameter Generate the prefix automatically from the configured service name. --- diff --git a/src/anvil/main.c b/src/anvil/main.c index 47425d217b..7e4050bc59 100644 --- a/src/anvil/main.c +++ b/src/anvil/main.c @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) if (master_service_settings_read_simple(master_service, NULL, &error) < 0) i_fatal("Error reading configuration: %s", error); - master_service_init_log(master_service, "anvil: "); + master_service_init_log(master_service); restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); restrict_access_allow_coredumps(TRUE); diff --git a/src/auth/main.c b/src/auth/main.c index ad91f8bd36..c7d7e6252c 100644 --- a/src/auth/main.c +++ b/src/auth/main.c @@ -373,7 +373,7 @@ int main(int argc, char *argv[]) MASTER_SERVICE_FLAG_NO_SSL_INIT; master_service = master_service_init("auth", service_flags, &argc, &argv, "w"); - master_service_init_log(master_service, "auth: "); + master_service_init_log(master_service); while ((c = master_getopt(master_service)) > 0) { switch (c) { diff --git a/src/config/main.c b/src/config/main.c index 74edfa639f..01a80ba827 100644 --- a/src/config/main.c +++ b/src/config/main.c @@ -25,7 +25,7 @@ int main(int argc, char *argv[]) &argc, &argv, ""); if (master_getopt(master_service) > 0) return FATAL_DEFAULT; - master_service_init_log(master_service, "config: "); + master_service_init_log(master_service); restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); restrict_access_allow_coredumps(TRUE); diff --git a/src/director/director-test.c b/src/director/director-test.c index a27aa5dd06..811150f4a2 100644 --- a/src/director/director-test.c +++ b/src/director/director-test.c @@ -593,7 +593,7 @@ int main(int argc, char *argv[]) if (admin_path == NULL) i_fatal("director-doveadm socket path missing"); - master_service_init_log(master_service, "director-test: "); + master_service_init_log(master_service); main_init(admin_path); master_service_init_finish(master_service); diff --git a/src/director/main.c b/src/director/main.c index 0dc8db98e3..e73cc61353 100644 --- a/src/director/main.c +++ b/src/director/main.c @@ -341,7 +341,7 @@ int main(int argc, char *argv[]) &error) < 0) i_fatal("Error reading configuration: %s", error); - master_service_init_log(master_service, "director: "); + master_service_init_log(master_service); main_preinit(); director->test_port = test_port; diff --git a/src/dns/dns-client.c b/src/dns/dns-client.c index fd39efa4e0..8903eb39f4 100644 --- a/src/dns/dns-client.c +++ b/src/dns/dns-client.c @@ -143,7 +143,7 @@ int main(int argc, char *argv[]) if (master_getopt(master_service) > 0) return FATAL_DEFAULT; - master_service_init_log(master_service, "dns-client: "); + master_service_init_log(master_service); restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); restrict_access_allow_coredumps(TRUE); diff --git a/src/doveadm/doveadm-log.c b/src/doveadm/doveadm-log.c index 3deff9162b..5bd7aacfcf 100644 --- a/src/doveadm/doveadm-log.c +++ b/src/doveadm/doveadm-log.c @@ -34,7 +34,7 @@ cmd_log_test(int argc ATTR_UNUSED, char *argv[] ATTR_UNUSED) master_service->log_initialized = FALSE; master_service->flags |= MASTER_SERVICE_FLAG_DONT_LOG_TO_STDERR; - master_service_init_log(master_service, "doveadm: "); + master_service_init_log(master_service); i_zero(&ctx); for (i = 0; i < LAST_LOG_TYPE; i++) { diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c index 66104e291f..16afda7ec9 100644 --- a/src/doveadm/doveadm.c +++ b/src/doveadm/doveadm.c @@ -346,7 +346,7 @@ int main(int argc, char *argv[]) } else { doveadm_read_settings(); } - master_service_init_log(master_service, "doveadm: "); + master_service_init_log(master_service); doveadm_cmds_init(); for (i = 0; i < N_ELEMENTS(doveadm_cmdline_commands); i++) diff --git a/src/doveadm/main.c b/src/doveadm/main.c index 23767a0c71..c42594c775 100644 --- a/src/doveadm/main.c +++ b/src/doveadm/main.c @@ -143,7 +143,7 @@ int main(int argc, char *argv[]) &error) < 0) i_fatal("Error reading configuration: %s", error); - master_service_init_log(master_service, "doveadm: "); + master_service_init_log(master_service); main_preinit(); master_service_set_die_callback(master_service, doveadm_die); diff --git a/src/imap-hibernate/main.c b/src/imap-hibernate/main.c index 0c24a116e6..dce14e0116 100644 --- a/src/imap-hibernate/main.c +++ b/src/imap-hibernate/main.c @@ -38,7 +38,7 @@ int main(int argc, char *argv[]) if (master_service_settings_read_simple(master_service, NULL, &error) < 0) i_fatal("Error reading configuration: %s", error); - master_service_init_log(master_service, "imap-hibernate: "); + master_service_init_log(master_service); restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); restrict_access_allow_coredumps(TRUE); diff --git a/src/imap-urlauth/imap-urlauth.c b/src/imap-urlauth/imap-urlauth.c index 70bc67a2c7..e7cb7d28f3 100644 --- a/src/imap-urlauth/imap-urlauth.c +++ b/src/imap-urlauth/imap-urlauth.c @@ -239,7 +239,7 @@ int main(int argc, char *argv[]) return FATAL_DEFAULT; } } - master_service_init_log(master_service, "imap-urlauth: "); + master_service_init_log(master_service); i_zero(&input); input.roots = set_roots; diff --git a/src/indexer/indexer.c b/src/indexer/indexer.c index 9b02d22d10..23b4cd57c6 100644 --- a/src/indexer/indexer.c +++ b/src/indexer/indexer.c @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) i_fatal("Error reading configuration: %s", error); set = master_service_settings_get(master_service); - master_service_init_log(master_service, "indexer: "); + master_service_init_log(master_service); restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); restrict_access_allow_coredumps(TRUE); master_service_set_idle_die_callback(master_service, idle_die); diff --git a/src/ipc/main.c b/src/ipc/main.c index db1e987357..f25d1774b0 100644 --- a/src/ipc/main.c +++ b/src/ipc/main.c @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) if (master_service_settings_read_simple(master_service, NULL, &error) < 0) i_fatal("Error reading configuration: %s", error); - master_service_init_log(master_service, "ipc: "); + master_service_init_log(master_service); master_service_set_die_with_master(master_service, TRUE); master_service_set_die_callback(master_service, ipc_die); diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c index ee00d895ef..d7bc7e1221 100644 --- a/src/lib-master/master-service.c +++ b/src/lib-master/master-service.c @@ -503,10 +503,10 @@ master_service_try_init_log(struct master_service *service, return TRUE; } -void master_service_init_log(struct master_service *service, - const char *prefix) +void master_service_init_log(struct master_service *service) { - master_service_init_log_with_prefix(service, prefix); + master_service_init_log_with_prefix(service, t_strdup_printf( + "%s: ", service->configured_name)); } void master_service_init_log_with_prefix(struct master_service *service, diff --git a/src/lib-master/master-service.h b/src/lib-master/master-service.h index 7d19604a42..435079171d 100644 --- a/src/lib-master/master-service.h +++ b/src/lib-master/master-service.h @@ -129,8 +129,7 @@ void master_service_env_clean(void); /* Initialize logging. Only the first call changes the actual logging functions. The following calls change the log prefix. */ -void master_service_init_log(struct master_service *service, - const char *prefix); +void master_service_init_log(struct master_service *service); /* Initialize/change log prefix to the given log prefix. */ void master_service_init_log_with_prefix(struct master_service *service, const char *prefix); diff --git a/src/login-common/main.c b/src/login-common/main.c index a6d2c4dcee..648e46f5ea 100644 --- a/src/login-common/main.c +++ b/src/login-common/main.c @@ -522,8 +522,7 @@ int login_binary_run(struct login_binary *binary, master_service = master_service_init(login_binary->process_name, service_flags, &argc, &argv, "Dl:R:S"); - master_service_init_log(master_service, t_strconcat( - login_binary->process_name, ": ", NULL)); + master_service_init_log(master_service); while ((c = master_getopt(master_service)) > 0) { switch (c) { diff --git a/src/master/main.c b/src/master/main.c index 70a9fb0138..6e0e68fe7d 100644 --- a/src/master/main.c +++ b/src/master/main.c @@ -430,7 +430,7 @@ sig_log_reopen(const siginfo_t *si ATTR_UNUSED, void *context ATTR_UNUSED) unsigned int uninitialized_count; service_signal(services->log, SIGUSR1, &uninitialized_count); - master_service_init_log(master_service, "master: "); + master_service_init_log(master_service); i_set_fatal_handler(master_fatal_callback); } @@ -870,7 +870,7 @@ int main(int argc, char *argv[]) pidfile_path = i_strconcat(set->base_dir, "/"MASTER_PID_FILE_NAME, NULL); - master_service_init_log(master_service, "master: "); + master_service_init_log(master_service); startup_early_errors_flush(); i_get_failure_handlers(&orig_fatal_callback, &orig_error_callback, &orig_info_callback, &orig_debug_callback); diff --git a/src/old-stats/main.c b/src/old-stats/main.c index 78cf5a2b9e..49f50f4c64 100644 --- a/src/old-stats/main.c +++ b/src/old-stats/main.c @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) if (master_service_settings_read_simple(master_service, set_roots, &error) < 0) i_fatal("Error reading configuration: %s", error); - master_service_init_log(master_service, "stats: "); + master_service_init_log(master_service); main_preinit(); diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c index add7d769c1..fba0a5c94f 100644 --- a/src/plugins/quota/quota-status.c +++ b/src/plugins/quota/quota-status.c @@ -349,7 +349,7 @@ int main(int argc, char *argv[]) if (protocol == QUOTA_PROTOCOL_UNKNOWN) i_fatal("Missing -p parameter"); - master_service_init_log(master_service, "quota-status: "); + master_service_init_log(master_service); main_preinit(); main_init(); diff --git a/src/replication/aggregator/aggregator.c b/src/replication/aggregator/aggregator.c index 66f82d6139..1677f9f76d 100644 --- a/src/replication/aggregator/aggregator.c +++ b/src/replication/aggregator/aggregator.c @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) if (master_service_settings_read_simple(master_service, set_roots, &error) < 0) i_fatal("Error reading configuration: %s", error); - master_service_init_log(master_service, "aggregator: "); + master_service_init_log(master_service); main_preinit(); diff --git a/src/replication/replicator/replicator.c b/src/replication/replicator/replicator.c index 24bacc2bce..360093454c 100644 --- a/src/replication/replicator/replicator.c +++ b/src/replication/replicator/replicator.c @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) if (master_service_settings_read_simple(master_service, set_roots, &error) < 0) i_fatal("Error reading configuration: %s", error); - master_service_init_log(master_service, "replicator: "); + master_service_init_log(master_service); restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); restrict_access_allow_coredumps(TRUE); diff --git a/src/stats/main.c b/src/stats/main.c index 3f43e2ba3e..0d1fd947ca 100644 --- a/src/stats/main.c +++ b/src/stats/main.c @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) if (master_service_settings_read_simple(master_service, set_roots, &error) < 0) i_fatal("Error reading configuration: %s", error); - master_service_init_log(master_service, "stats: "); + master_service_init_log(master_service); master_service_set_die_callback(master_service, stats_die); main_preinit(); diff --git a/src/util/rawlog.c b/src/util/rawlog.c index 691ee69e11..bd19e78a9f 100644 --- a/src/util/rawlog.c +++ b/src/util/rawlog.c @@ -410,7 +410,7 @@ int main(int argc, char *argv[]) if (argc < 1) i_fatal("Usage: rawlog [-f in|out] [-I] [-b] [-t] "); - master_service_init_log(master_service, "rawlog: "); + master_service_init_log(master_service); master_service_init_finish(master_service); executable = argv[0]; diff --git a/src/util/script-login.c b/src/util/script-login.c index 485ba0537e..e8f7b40f8b 100644 --- a/src/util/script-login.c +++ b/src/util/script-login.c @@ -214,7 +214,7 @@ int main(int argc, char *argv[]) argc -= optind; argv += optind; - master_service_init_log(master_service, "script-login: "); + master_service_init_log(master_service); if (!drop_to_userdb_privileges && (flags & MASTER_SERVICE_FLAG_STANDALONE) == 0) { diff --git a/src/util/script.c b/src/util/script.c index 4fa7f47f97..45f53ee494 100644 --- a/src/util/script.c +++ b/src/util/script.c @@ -293,7 +293,7 @@ int main(int argc, char *argv[]) array_append_zero(&aenvs); accepted_envs = p_strarray_dup(default_pool, array_front(&aenvs)); - master_service_init_log(master_service, "script: "); + master_service_init_log(master_service); if (argv[0] == NULL) i_fatal("Missing script path"); restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); diff --git a/src/util/tcpwrap.c b/src/util/tcpwrap.c index 990b70f071..cd63fcaf4c 100644 --- a/src/util/tcpwrap.c +++ b/src/util/tcpwrap.c @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) if (master_getopt(master_service) > 0) return FATAL_DEFAULT; - master_service_init_log(master_service, "tcpwrap: "); + master_service_init_log(master_service); restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); restrict_access_allow_coredumps(TRUE);