changeset 17048:e8efac64e081

master: Finished the previous DEBUG_OUTOFMEM -> CORE_OUTOFMEM and CORE_ERROR change.
author Timo Sirainen <tss@iki.fi>
date Sun, 08 Dec 2013 22:21:40 +0200
parents 10ded3e11a8e
children d837bd49ddee
files src/master/master-settings.c src/master/service-process.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/master-settings.c	Sun Dec 08 22:20:12 2013 +0200
+++ b/src/master/master-settings.c	Sun Dec 08 22:21:40 2013 +0200
@@ -217,7 +217,7 @@
 	.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",
--- a/src/master/service-process.c	Sun Dec 08 22:20:12 2013 +0200
+++ b/src/master/service-process.c	Sun Dec 08 22:21:40 2013 +0200
@@ -428,8 +428,8 @@
 				    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";