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 2023/04/12 12:40:56 UTC
[tinkerpop] branch master updated (0a5d813276 -> 0e4df1c21a)
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 0a5d813276 Merge branch '3.6-dev'
new deba2153bf Minor formatting CTR
new 3249e5856f Merge branch '3.5-dev' into 3.6-dev
new 0e4df1c21a Merge branch '3.6-dev'
The 3 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:
.../gremlin/server/handler/WsUserAgentHandler.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
[tinkerpop] 01/03: Minor formatting CTR
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 deba2153bf3dd5e174db8cbd176eaf37b660033e
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Apr 12 08:30:20 2023 -0400
Minor formatting CTR
---
.../gremlin/server/handler/WsUserAgentHandler.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java
index 045414d179..cd1e0a643e 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java
@@ -45,12 +45,12 @@ public class WsUserAgentHandler extends ChannelInboundHandlerAdapter {
public static final AttributeKey<String> USER_AGENT_ATTR_KEY = AttributeKey.valueOf(UserAgent.USER_AGENT_HEADER_NAME);
@Override
- public void userEventTriggered(ChannelHandlerContext ctx, java.lang.Object evt){
- if(evt instanceof WebSocketServerProtocolHandler.HandshakeComplete){
+ public void userEventTriggered(final ChannelHandlerContext ctx, java.lang.Object evt) {
+ if (evt instanceof WebSocketServerProtocolHandler.HandshakeComplete) {
final HttpHeaders requestHeaders = ((WebSocketServerProtocolHandler.HandshakeComplete) evt).requestHeaders();
- if(requestHeaders.contains(UserAgent.USER_AGENT_HEADER_NAME)){
- String userAgent = requestHeaders.get(UserAgent.USER_AGENT_HEADER_NAME);
+ if (requestHeaders.contains(UserAgent.USER_AGENT_HEADER_NAME)){
+ final String userAgent = requestHeaders.get(UserAgent.USER_AGENT_HEADER_NAME);
ctx.channel().attr(USER_AGENT_ATTR_KEY).set(userAgent);
logger.debug("New Connection on channel [{}] with user agent [{}]", ctx.channel().id().asShortText(), userAgent);
@@ -61,12 +61,11 @@ public class WsUserAgentHandler extends ChannelInboundHandlerAdapter {
// large number of unique user agents. For this reason the user agent is replaced with "other"
// for the purpose of metrics if this cap is ever exceeded and the user agent is not already being tracked.
if(MetricManager.INSTANCE.getCounterSize() > MAX_USER_AGENT_METRICS &&
- !MetricManager.INSTANCE.contains(metricName)){
+ !MetricManager.INSTANCE.contains(metricName)) {
metricName = MetricRegistry.name(GremlinServer.class, "user-agent", "other");
}
MetricManager.INSTANCE.getCounter(metricName).inc();
- }
- else{
+ } else {
logger.debug("New Connection on channel [{}] with no user agent provided", ctx.channel().id().asShortText());
}
}
[tinkerpop] 03/03: Merge branch '3.6-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 0e4df1c21a141b23191bc21448dbf9f58501c348
Merge: 0a5d813276 3249e5856f
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Apr 12 08:40:40 2023 -0400
Merge branch '3.6-dev'
.../gremlin/server/handler/WsUserAgentHandler.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --cc gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java
index 3f85e1113d,cd1e0a643e..49d7f15200
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java
@@@ -40,18 -41,16 +40,18 @@@ public class WsUserAgentHandler extend
*/
private static final int MAX_USER_AGENT_METRICS = 10000;
+ private static final String USER_AGENT_HEADER_NAME = "User-Agent";
+
private static final Logger logger = LoggerFactory.getLogger(WsUserAgentHandler.class);
- public static final AttributeKey<String> USER_AGENT_ATTR_KEY = AttributeKey.valueOf(UserAgent.USER_AGENT_HEADER_NAME);
+ public static final AttributeKey<String> USER_AGENT_ATTR_KEY = AttributeKey.valueOf(USER_AGENT_HEADER_NAME);
@Override
- public void userEventTriggered(ChannelHandlerContext ctx, java.lang.Object evt){
- if(evt instanceof WebSocketServerProtocolHandler.HandshakeComplete){
+ public void userEventTriggered(final ChannelHandlerContext ctx, java.lang.Object evt) {
+ if (evt instanceof WebSocketServerProtocolHandler.HandshakeComplete) {
final HttpHeaders requestHeaders = ((WebSocketServerProtocolHandler.HandshakeComplete) evt).requestHeaders();
- if(requestHeaders.contains(USER_AGENT_HEADER_NAME)){
- String userAgent = requestHeaders.get(USER_AGENT_HEADER_NAME);
- if (requestHeaders.contains(UserAgent.USER_AGENT_HEADER_NAME)){
- final String userAgent = requestHeaders.get(UserAgent.USER_AGENT_HEADER_NAME);
++ if (requestHeaders.contains(USER_AGENT_HEADER_NAME)){
++ final String userAgent = requestHeaders.get(USER_AGENT_HEADER_NAME);
ctx.channel().attr(USER_AGENT_ATTR_KEY).set(userAgent);
logger.debug("New Connection on channel [{}] with user agent [{}]", ctx.channel().id().asShortText(), userAgent);
[tinkerpop] 02/03: Merge branch '3.5-dev' into 3.6-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 3249e5856fee577cae9a2f69260cbc6c6c1ffd66
Merge: 11710f2ace deba2153bf
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Apr 12 08:30:39 2023 -0400
Merge branch '3.5-dev' into 3.6-dev
.../gremlin/server/handler/WsUserAgentHandler.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)