From 9ca431a543566905c74371096c619c124429a043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=82=A8=EB=93=9D=EC=9C=A4?= <67302707+ndy2@users.noreply.github.com> Date: Tue, 8 Nov 2022 09:57:47 +0900 Subject: [PATCH] Update logging message on MultipleJGitEnvironmentRepository, JGitEnvironmentRepository (#2162) --- .../config/server/environment/JGitEnvironmentRepository.java | 2 +- .../server/environment/MultipleJGitEnvironmentRepository.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java index b4518ea6..a3847baa 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java @@ -259,7 +259,7 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository if (this.defaultLabel.equals(label) && JGitEnvironmentProperties.MAIN_LABEL.equals(this.defaultLabel) && tryMasterBranch) { logger.info("Could not refresh default label " + label, e); - logger.info("Will try to checkout master label instead."); + logger.info("Will try to refresh master label instead."); version = refresh(JGitEnvironmentProperties.MASTER_LABEL); } else { diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepository.java index e9948f2c..9d6f9a80 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepository.java @@ -174,9 +174,11 @@ public class MultipleJGitEnvironmentRepository extends JGitEnvironmentRepository } catch (Exception e) { if (MultipleJGitEnvironmentProperties.MAIN_LABEL.equals(label) && isTryMasterBranch()) { + logger.info("Cannot find Environment with default label " + getDefaultLabel(), e); + logger.info("Will try to find Environment master label instead."); candidate = getRepository(this, application, profile, MultipleJGitEnvironmentProperties.MASTER_LABEL); return findOneFromCandidate(candidate, application, profile, - MultipleJGitEnvironmentProperties.MASTER_LABEL, includeOrigin); + MultipleJGitEnvironmentProperties.MASTER_LABEL, includeOrigin); } throw e; }