You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2021/01/27 21:46:29 UTC
[tinkerpop] branch master updated (715e6af -> 81c3fbc)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 715e6af Merge branch '3.4-dev'
add 19c3e69 Make server setings extensible
add 1e93087 Merge branch 'pr-1381' into 3.4-dev
add d8c0439 Minor adjustments CTR
new 81c3fbc Merge branch '3.4-dev'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/server/Settings.java | 42 +++++++++------
.../tinkerpop/gremlin/server/SettingsTest.java | 59 ++++++++++++++++++++++
.../gremlin/server/custom-gremlin-server.yaml | 9 +---
4 files changed, 88 insertions(+), 23 deletions(-)
create mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/SettingsTest.java
copy gremlin-console/src/main/docker/docker-entrypoint.sh => gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/custom-gremlin-server.yaml (91%)
mode change 100755 => 100644
[tinkerpop] 01/01: Merge branch '3.4-dev'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 81c3fbcf2a00a8d69bd2d4e02852e80ed895078f
Merge: 715e6af d8c0439
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Jan 27 16:25:30 2021 -0500
Merge branch '3.4-dev'
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/server/Settings.java | 42 +++++++++------
.../tinkerpop/gremlin/server/SettingsTest.java | 59 ++++++++++++++++++++++
.../gremlin/server/custom-gremlin-server.yaml | 19 +++++++
4 files changed, 105 insertions(+), 16 deletions(-)
diff --cc gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
index f58c140,b01b7e5..3a535ab
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
@@@ -327,17 -323,21 +325,29 @@@ public class Settings
final TypeDescription graphiteReporterDescription = new TypeDescription(GraphiteReporterMetrics.class);
constructor.addTypeDescription(graphiteReporterDescription);
+ return constructor;
+ }
+
+ /**
+ * Read configuration from a file into a new {@link Settings} object.
+ *
+ * @param stream an input stream containing a Gremlin Server YAML configuration
+ * @return a new {@link Optional} object wrapping the created {@link Settings}
+ */
+ public static Settings read(final InputStream stream) {
+ Objects.requireNonNull(stream);
+ final Constructor constructor = createDefaultYamlConstructor();
final Yaml yaml = new Yaml(constructor);
- return yaml.loadAs(stream, Settings.class);
+ final Settings settings = yaml.loadAs(stream, Settings.class);
+ if (settings.authentication.enableAuditLog && settings.enableAuditLog) {
+ logger.warn("Both authentication.enableAuditLog and settings.enableAuditLog " +
+ "are enabled, so auditable events are logged twice.");
+ }
+ if (settings.authentication.enableAuditLog && !settings.enableAuditLog) {
+ logger.warn("Configuration property 'authentication.enableAuditLog' is deprecated, use 'enableAuditLog' instead.");
+ }
+ return settings;
}
/**