Feature: custom server file location #3401
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #3401 +/- ##
============================================
+ Coverage 51.51% 51.54% +0.03%
- Complexity 2307 2312 +5
============================================
Files 441 441
Lines 13762 13774 +12
Branches 1400 1404 +4
============================================
+ Hits 7089 7100 +11
- Misses 6185 6186 +1
Partials 488 488
Continue to review full report at Codecov.
|
nobodyiam
reviewed
Nov 28, 2020
| String path = Utils.isOSWindows() ? SERVER_PROPERTIES_WINDOWS : SERVER_PROPERTIES_LINUX; | ||
|
|
||
| File file = new File(path); | ||
| File file = ResolvedPaths.SERVER_PROPERTIES.toFile(); |
There was a problem hiding this comment.
How about we make it a little simpler?
e.g.
...
File file = new File(getServerPropertiesPath());
...
String getServerPropertiesPath() {
String serverPropertiesPath = getCustomizedServerPropertiesPath();
if (Strings.isNullOrEmpty(serverPropertiesPath)) {
serverPropertiesPath = Utils.isOSWindows() ? SERVER_PROPERTIES_WINDOWS : SERVER_PROPERTIES_LINUX;
}
return serverPropertiesPath;
}
private String getCustomizedServerPropertiesPath() {
// 1. Get from System Property
String serverPropertiesPath = System.getProperty("apollo.serverPropertiesPath");
if (Strings.isNullOrEmpty(serverPropertiesPath)) {
// 2. Get from OS environment variable
serverPropertiesPath = System.getenv("APOLLO_SERVERPROPERTIESPATH");
}
return serverPropertiesPath;
}
There was a problem hiding this comment.
Has Changed to simpler implemention.
How about use APOLLO_PATH_SERVER_PROPERTIES to instead of APOLLO_SERVERPROPERTIESPATH for better readability?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's the purpose of this PR
Let user can custom file
server.properties's location through system property or environment variable.Which issue(s) this PR fixes:
#2734
#3389
Brief changelog
Resolve the path of file
server.propertiesincom.ctrip.framework.foundation.internals.constant.PathConstants.ResolvedPaths#SERVER_PROPERTIES,and change
com.ctrip.framework.foundation.internals.provider.DefaultServerProviderto use it directly.Follow this checklist to help us incorporate your contribution quickly and easily:
mvn clean testto make sure this pull request doesn't break anything.