This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-1641
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit bbe49606f323a0d25d68d9e23877b52d62316f17
Author: HadoopMarc <vts...@xs4all.nl>
AuthorDate: Sat May 9 21:26:42 2020 +0200
Small textual changes
---
docs/src/reference/gremlin-applications.asciidoc | 11 +++++------
docs/src/reference/gremlin-variants.asciidoc | 6 +++---
.../src/main/python/gremlin_python/driver/protocol.py | 6 +++---
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/docs/src/reference/gremlin-applications.asciidoc
b/docs/src/reference/gremlin-applications.asciidoc
index 2bad34f..9bfaf6e 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1259,11 +1259,10 @@ authentication: {
keytab: /etc/security/keytabs/gremlinserver.service.keytab}}
`Krb5Authenticator` needs a Kerberos service principal and a keytab that holds
the secret key for that principal. The keytab
-location and service name, e.g. gremlinserver, are free to be chosen. In
addition, if the krb5.conf kerberos
-configuration file is not available from the
-https://web.mit.edu/kerberos/krb5-devel/doc/mitK5defaults.html[default
location], `Krb5Authenticator` needs the location
-of the krb5.conf configuration file, to be specified as a system property in
the JAVA_OPTIONS environment variable
-of Gremlin Server:
+location and service name, e.g. gremlinserver, are free to be chosen.
`Krb5Authenticator` finds the KDC's hostname and
+port from the krb5.conf file with Kerberos configurations. This file can
reside at either the
+https://web.mit.edu/kerberos/krb5-devel/doc/mitK5defaults.html[default
location] or a location to be specified as a
+system property in the JAVA_OPTIONS environment variable of Gremlin Server:
[source, bash]
export JAVA_OPTIONS="${JAVA_OPTIONS} -Xms512m -Xmx4096m
-Djava.security.krb5.conf=/etc/krb5.conf"
@@ -1288,7 +1287,7 @@ ticket cache that is normally refreshed when a user logs
in to a host within the
The Gremlin client needs the location of the JAAS configuration file to be
passed as a system property to the JVM. For
Gremlin-Console the easiest way to do this is to pass it to the run script via
the JAVA_OPTIONS environment property.
-If the krb5.conf kerberos configuration file is not available from the
+If the krb5.conf Kerberos configuration file is not available from the
https://web.mit.edu/kerberos/krb5-devel/doc/mitK5defaults.html[default
location] it has to be provided as a system
property as well:
diff --git a/docs/src/reference/gremlin-variants.asciidoc
b/docs/src/reference/gremlin-variants.asciidoc
index 96bc942..45b12e5 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -675,12 +675,12 @@ g = traversal().withRemote(DriverRemoteConnection(
# Kerberos authentication
g = traversal().withRemote(DriverRemoteConnection(
- 'ws://localhost:8182/gremlin', 'g', kerberized_service='gremlin'))
+ 'ws://localhost:8182/gremlin', 'g',
kerberized_service='grem...@hostname.your.org'))
----
The value specified for the kerberized_service should correspond to the first
part of the principal name configured for
-the gremlin service. The Gremlin-Python client reads the kerberos
configurations from your system.
-It finds the KDC's hostname and port from the krb5.conf file at the
+the gremlin service, but with the slash replaced by an _at_ sign. The
Gremlin-Python client reads the kerberos
+configurations from your system. It finds the KDC's hostname and port from the
krb5.conf file at the
https://web.mit.edu/kerberos/krb5-devel/doc/mitK5defaults.html[default
location] or as indicated in the KRB5_CONFIG
environment variable. It finds credentials from the credential cache or a
keytab file at the
https://web.mit.edu/kerberos/krb5-devel/doc/mitK5defaults.html[default
locations] or as indicated
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/protocol.py
b/gremlin-python/src/main/python/gremlin_python/driver/protocol.py
index ea8f625..667f828 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/protocol.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/protocol.py
@@ -88,9 +88,9 @@ class GremlinServerWSProtocol(AbstractBaseProtocol):
def data_received(self, message, results_dict):
# if Gremlin Server cuts off then we get a None for the message
if message is None:
- raise GremlinServerError(
- {'code': 500, 'message': 'Server disconnected - please try to
reconnect',
- 'attributes': {}})
+ raise GremlinServerError({'code': 500, 'message': 'Server
disconnected - please try to reconnect',
+ 'attributes': {}})
+
message = self._message_serializer.deserialize_message(message)
request_id = message['requestId']
result_set = results_dict[request_id] if request_id in results_dict
else ResultSet(None, None)
