From 7fc91e27999996932fb8094a6d566466db2167db Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 8 Dec 2013 22:21:40 +0200 Subject: [PATCH] master: Finished the previous DEBUG_OUTOFMEM -> CORE_OUTOFMEM and CORE_ERROR change. --- src/master/master-settings.c | 2 +- src/master/service-process.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/master/master-settings.c b/src/master/master-settings.c index 16e4ebf54d..4beb97d332 100644 --- a/src/master/master-settings.c +++ b/src/master/master-settings.c @@ -217,7 +217,7 @@ static const struct master_settings master_default_settings = { .state_dir = PKG_STATEDIR, .libexec_dir = PKG_LIBEXECDIR, .instance_name = PACKAGE, - .import_environment = "TZ DEBUG_OUTOFMEM" ENV_SYSTEMD ENV_GDB, + .import_environment = "TZ CORE_OUTOFMEM CORE_ERROR" ENV_SYSTEMD ENV_GDB, .protocols = "imap pop3 lmtp", .listen = "*, ::", .ssl = "yes:no:required", diff --git a/src/master/service-process.c b/src/master/service-process.c index 73dd521cf5..9286ec2760 100644 --- a/src/master/service-process.c +++ b/src/master/service-process.c @@ -428,8 +428,8 @@ get_exit_status_message(struct service *service, enum fatal_exit_status status) service->set->name, (unsigned int)(service->vsz_limit/1024/1024)); } - if (getenv("DEBUG_OUTOFMEM") == NULL) - str_append(str, " - set DEBUG_OUTOFMEM=1 environment to get core dump"); + if (getenv("CORE_OUTOFMEM") == NULL) + str_append(str, " - set CORE_OUTOFMEM=1 environment to get core dump"); return str_c(str); case FATAL_EXEC: return "exec() failed"; -- 2.47.3