You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/05/10 07:06:32 UTC
[4/7] flink git commit: [FLINK-6459] Move origin header ConfigOption
to JMOptions
[FLINK-6459] Move origin header ConfigOption to JMOptions
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/4ab39381
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4ab39381
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4ab39381
Branch: refs/heads/master
Commit: 4ab39381222df3fd7673c183bc357a4a91b79f32
Parents: 160daa6
Author: zentol <ch...@apache.org>
Authored: Fri May 5 12:13:10 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Tue May 9 22:56:48 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/flink/configuration/ConfigConstants.java | 6 ------
.../org/apache/flink/configuration/JobManagerOptions.java | 8 ++++++++
.../apache/flink/runtime/webmonitor/WebMonitorConfig.java | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/4ab39381/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
index 4897854..92e6b5d 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
@@ -1338,12 +1338,6 @@ public final class ConfigConstants {
key("jobmanager.web.address")
.noDefaultValue();
- /** The config parameter defining the Access-Control-Allow-Origin header for all
- * responses from the web-frontend. */
- public static final ConfigOption<String> JOB_MANAGER_WEB_ACCESS_CONTROL_ALLOW_ORIGIN =
- key("jobmanager.web.access-control-allow-origin")
- .defaultValue("*");
-
/** The config key for the port of the JobManager web frontend.
* Setting this value to {@code -1} disables the web frontend. */
public static final int DEFAULT_JOB_MANAGER_WEB_FRONTEND_PORT = 8081;
http://git-wip-us.apache.org/repos/asf/flink/blob/4ab39381/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
index b0b1eee..b924e8e 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
@@ -108,6 +108,14 @@ public class JobManagerOptions {
.defaultValue(8081);
/**
+ * The config parameter defining the Access-Control-Allow-Origin header for all
+ * responses from the web-frontend.
+ */
+ public static final ConfigOption<String> WEB_ACCESS_CONTROL_ALLOW_ORIGIN =
+ key("jobmanager.web.access-control-allow-origin")
+ .defaultValue("*");
+
+ /**
* Config parameter to override SSL support for the JobManager Web UI
*/
public static final ConfigOption<Boolean> WEB_SSL_ENABLED =
http://git-wip-us.apache.org/repos/asf/flink/blob/4ab39381/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java
index 1807e7d..dba2145 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java
@@ -81,6 +81,6 @@ public class WebMonitorConfig {
}
public String getAllowOrigin() {
- return config.getString(ConfigConstants.JOB_MANAGER_WEB_ACCESS_CONTROL_ALLOW_ORIGIN);
+ return config.getString(JobManagerOptions.WEB_ACCESS_CONTROL_ALLOW_ORIGIN);
}
}