From 46470934d7a9eafe57b5de83da8e9bfd29d68cad Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 19 Jan 2016 09:38:25 +0100 Subject: [PATCH] Fix log message Closes gh-4969 --- .../boot/logging/logback/LogbackLoggingSystem.java | 4 ++-- .../boot/logging/logback/LogbackLoggingSystemTests.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java index 31a5bfca8e..96e9533739 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -107,7 +107,7 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem { if (StringUtils.hasText(System.getProperty(CONFIGURATION_FILE_PROPERTY))) { getLogger(LogbackLoggingSystem.class.getName()).warn( "Ignoring '" + CONFIGURATION_FILE_PROPERTY + "' system property. " - + "Please use 'logging.path' instead."); + + "Please use 'logging.config' instead."); } } diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java index 270fc24b23..57b10dfa10 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -149,7 +149,7 @@ public class LogbackLoggingSystemTests extends AbstractLoggingSystemTests { this.loggingSystem.initialize(this.initializationContext, null, null); String output = this.output.toString().trim(); assertTrue("Wrong output:\n" + output, output.contains("Ignoring " - + "'logback.configurationFile' system property. Please use 'logging.path' instead.")); + + "'logback.configurationFile' system property. Please use 'logging.config' instead.")); } finally { System.clearProperty("logback.configurationFile");