WatchdogMain.cpp in passenger-6.0.15

- old
+ new

@@ -669,10 +669,11 @@
 	printf("      --pid-file PATH         Store the watchdog's PID in the given file. The\n");
 	printf("                              file is deleted on exit\n");
 	printf("      --no-delete-pid-file    Do not delete PID file on exit\n");
 	printf("      --log-file PATH         Log to the given file.\n");
 	printf("      --log-level LEVEL       Logging level. [A] Default: %d\n", DEFAULT_LOG_LEVEL);
+	printf("      --disable-log-prefix    Disables prefixing application logs with App PID stdout\n");
 	printf("      --report-file PATH      Upon successful initialization, report instance\n");
 	printf("                              information to the given file, in JSON format\n");
 	printf("      --cleanup-pidfile PATH  Upon shutdown, kill the process specified by\n");
 	printf("                              the given PID file\n");
 	printf("\n");
@@ -811,9 +812,12 @@
 			updates["pidfiles_to_delete_on_exit"].append(argv[i + 1]);
 			i += 2;
 		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--log-file")) {
 			updates["log_target"] = argv[i + 1];
 			i += 2;
+		} else if (p.isFlag(argv[i], '\0', "--disable-log-prefix")) {
+			updates["disable_log_prefix"] = true;
+			i++;
 		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--ctl")) {
 			const char *value = strchr(argv[i + 1], '=');
 			if (value == NULL) {
 				fprintf(stderr, "ERROR: '%s' is not a valid --ctl parameter. "
 					"It must be in the form of NAME=VALUE.\n", argv[i + 1]);