[FLINK-7408] [conf] Create WebOptions for WebRuntimeMonitor #4512
Conversation
This file contains hidden or 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
This commit moves the WebRuntimeMonitor related configuration options from JobManagerOptions to WebOptions. Moreover, it removes the prefix jobmanager.
zentol
approved these changes
Aug 10, 2017
Contributor
zentol
left a comment
zentol
left a comment
There was a problem hiding this comment.
1 whitespace issue, and a few unecessary calls to ConfigOption#key() that we could remove since we touch the lines anyway, otherwise +1.
| if( | ||
| config.getBoolean(ConfigConstants.LOCAL_START_WEBSERVER, false) && | ||
| config.getInteger(JobManagerOptions.WEB_PORT.key(), 0) >= 0) { | ||
| config.getInteger(WebOptions.PORT.key(), 0) >= 0) { |
Contributor
There was a problem hiding this comment.
you can drop the call to key().
| // if a web monitor shall be started, set the port to random binding | ||
| if (configuration.getInteger(JobManagerOptions.WEB_PORT.key(), 0) >= 0) { | ||
| configuration.setInteger(JobManagerOptions.WEB_PORT, 0); | ||
| if (configuration.getInteger(WebOptions.PORT.key(), 0) >= 0) { |
| // if a web monitor shall be started, set the port to random binding | ||
| if (configuration.getInteger(JobManagerOptions.WEB_PORT.key(), 0) >= 0) { | ||
| configuration.setInteger(JobManagerOptions.WEB_PORT, 0); | ||
| if (configuration.getInteger(WebOptions.PORT.key(), 0) >= 0) { |
|
|
||
| val webMonitor: Option[WebMonitor] = | ||
| if (configuration.getInteger(JobManagerOptions.WEB_PORT.key(), 0) >= 0) { | ||
| if (configuration.getInteger(WebOptions.PORT.key(), 0) >= 0) { |
| config.setInteger(JobManagerOptions.PORT, Integer.parseInt(address.port().get().toString())); | ||
|
|
||
| if (config.getInteger(JobManagerOptions.WEB_PORT.key(), 0) >= 0) { | ||
| if (config.getInteger(WebOptions.PORT.key(), 0) >= 0) { |
|
|
||
| // Config to enable https access to the web-ui | ||
| boolean enableSSL = config.getBoolean(JobManagerOptions.WEB_SSL_ENABLED) && SSLUtils.getSSLEnabled(config); | ||
| boolean enableSSL = config.getBoolean(WebOptions.SSL_ENABLED) && SSLUtils.getSSLEnabled(config); |
Contributor
There was a problem hiding this comment.
whitespace after && seems off.
Contributor
Author
|
Thanks for the review @zentol. You're right that we should remove the |
tillrohrmann
force-pushed
the
portWebMonitorOptions
branch
from
3a9060e to
4033fad
Compare
Contributor
Author
|
Merging this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 is the purpose of the change
This commit moves the WebRuntimeMonitor related configuration options from
JobManagerOptions to WebOptions. Moreover, it removes the prefix jobmanager.
As you've requested @zentol.
Verifying this change
This change is a trivial rework / code cleanup without any test coverage.
Does this pull request potentially affect one of the following parts:
@Public(Evolving): (yes)Documentation