Repository: tinkerpop Updated Branches: refs/heads/tp32 c36fc5c6b -> c029eef8e
Added gremlin version to gremlin server startup logging output CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c029eef8 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c029eef8 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c029eef8 Branch: refs/heads/tp32 Commit: c029eef8e9641e9908a09b06d4ec7b3f5236508b Parents: c36fc5c Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Sep 6 08:23:44 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Sep 6 08:23:44 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + gremlin-server/conf/log4j-server.properties | 1 + .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c029eef8/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 48f78e4..158cc7a 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -24,6 +24,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima === TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET) * SSL security enhancements +* Added Gremlin version to Gremlin Server startup logging output. * Fixed problem with Gremlin Server sometimes returning an additional message after a failure. * Allowed spaces in classpath for `gremlin-server.bat`. * Fixed bug in traversals that used Python lambdas with strategies in `gremlin-python`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c029eef8/gremlin-server/conf/log4j-server.properties ---------------------------------------------------------------------- diff --git a/gremlin-server/conf/log4j-server.properties b/gremlin-server/conf/log4j-server.properties index 2529887..8bf809c 100644 --- a/gremlin-server/conf/log4j-server.properties +++ b/gremlin-server/conf/log4j-server.properties @@ -29,3 +29,4 @@ log4j.logger.org.apache.tinkerpop.gremlin.hadoop.process.computer.mapreduce.MapR log4j.logger.org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph=INFO log4j.logger.org.apache.tinkerpop.gremlin.spark.process.computer.SparkGraphComputer=INFO log4j.logger.org.apache.spark.metrics.MetricsSystem=ERROR +log4j.logger.com.jcabi.manifests.Manifests=OFF http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c029eef8/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java index 7aefbe6..a402454 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java @@ -38,6 +38,7 @@ import org.apache.tinkerpop.gremlin.server.util.LifeCycleHook; import org.apache.tinkerpop.gremlin.server.util.MetricManager; import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor; import org.apache.tinkerpop.gremlin.server.util.ThreadFactoryUtil; +import org.apache.tinkerpop.gremlin.util.Gremlin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -370,7 +371,7 @@ public class GremlinServer { public static String getHeader() { final StringBuilder builder = new StringBuilder(); - builder.append("\r\n"); + builder.append(Gremlin.version() + "\r\n"); builder.append(" \\,,,/\r\n"); builder.append(" (o o)\r\n"); builder.append("-----oOOo-(3)-oOOo-----\r\n");