master: Finished the previous DEBUG_OUTOFMEM -> CORE_OUTOFMEM and CORE_ERROR change.

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index 16e4ebf54d3f160e7870d8b3aa724e6e1e9c6fd0..4beb97d332b973d2cd8003679399d0e214f2f21b 100644 (file)
--- 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 73dd521cf5a4c09665229671e758dbdb50cee274..9286ec27607a916fbf2471bda76894f1660a70b0 100644 (file)
--- 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";