Skip to content

Commit c63b229

Browse files
committed
Update logging message on JGitEnvironmentRepository, MultipleJGitEnvironmentRepository
1 parent 579a3cd commit c63b229

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public synchronized Locations getLocations(String application, String profile, S
259259
if (this.defaultLabel.equals(label) && JGitEnvironmentProperties.MAIN_LABEL.equals(this.defaultLabel)
260260
&& tryMasterBranch) {
261261
logger.info("Could not refresh default label " + label, e);
262-
logger.info("Will try to checkout master label instead.");
262+
logger.info("Will try to refresh master label instead.");
263263
version = refresh(JGitEnvironmentProperties.MASTER_LABEL);
264264
}
265265
else {

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepository.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ public Environment findOne(String application, String profile, String label, boo
160160
this.logger.debug("Cannot load configuration from " + candidate.getUri() + ", cause: ("
161161
+ e.getClass().getSimpleName() + ") " + e.getMessage(), e);
162162
}
163-
continue;
164163
}
165164
}
166165
}
@@ -174,9 +173,11 @@ public Environment findOne(String application, String profile, String label, boo
174173
}
175174
catch (Exception e) {
176175
if (MultipleJGitEnvironmentProperties.MAIN_LABEL.equals(label) && isTryMasterBranch()) {
176+
logger.info("Cannot find Environment with default label " + getDefaultLabel(), e);
177+
logger.info("Will try to find Environment master label instead.");
177178
candidate = getRepository(this, application, profile, MultipleJGitEnvironmentProperties.MASTER_LABEL);
178179
return findOneFromCandidate(candidate, application, profile,
179-
MultipleJGitEnvironmentProperties.MASTER_LABEL, includeOrigin);
180+
MultipleJGitEnvironmentProperties.MASTER_LABEL, includeOrigin);
180181
}
181182
throw e;
182183
}

0 commit comments

Comments
 (0)