This is an automated email from the ASF dual-hosted git repository.
liuhan pushed a commit to branch tmp_disable_reading
in repository https://gitbox.apache.org/repos/asf/skywalking-rover.git
The following commit(s) were added to refs/heads/tmp_disable_reading by this
push:
new 2074df2 remove test log
2074df2 is described below
commit 2074df22b4eb1e53a864a547ed7114ae8eb3b91b
Author: mrproliu <[email protected]>
AuthorDate: Thu Dec 19 20:00:19 2024 +0800
remove test log
---
pkg/accesslog/collector/protocols/queue.go | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/pkg/accesslog/collector/protocols/queue.go
b/pkg/accesslog/collector/protocols/queue.go
index 21817fc..3ae9b6e 100644
--- a/pkg/accesslog/collector/protocols/queue.go
+++ b/pkg/accesslog/collector/protocols/queue.go
@@ -224,7 +224,7 @@ func (p *PartitionContext) Consume(data interface{}) {
forwarder.SendTransferNoProtocolEvent(p.context, event)
return
}
- connection := p.getConnectionContext(event.GetConnectionID(),
event.GetRandomID(), event.GetProtocol(), event.DataID(), 1)
+ connection := p.getConnectionContext(event.GetConnectionID(),
event.GetRandomID(), event.GetProtocol(), event.DataID())
connection.AppendDetail(p.context, event)
case *events.SocketDataUploadEvent:
pid, _ := events.ParseConnectionID(event.ConnectionID)
@@ -244,18 +244,15 @@ func (p *PartitionContext) Consume(data interface{}) {
log.Debugf("receive the socket data event, connection ID: %d,
random ID: %d, pid: %d, prev data id: %d, "+
"data id: %d, sequence: %d, protocol: %d, http1 type:
%d",
event.ConnectionID, event.RandomID, pid,
event.PrevDataID0, event.DataID0, event.Sequence0, event.Protocol0, status)
- connection := p.getConnectionContext(event.ConnectionID,
event.RandomID, event.Protocol0, event.DataID0, 2)
+ connection := p.getConnectionContext(event.ConnectionID,
event.RandomID, event.Protocol0, event.DataID0)
connection.AppendData(event)
}
}
func (p *PartitionContext) getConnectionContext(connectionID, randomID uint64,
- protocol enums.ConnectionProtocol, currentDataID uint64, from int)
*PartitionConnection {
+ protocol enums.ConnectionProtocol, currentDataID uint64)
*PartitionConnection {
conKey := p.buildConnectionKey(connectionID, randomID)
conn, exist := p.connections.Get(conKey)
- log.Infof("get the connection context, connection ID: %d, random ID:
%d, partition number: %d, connection exist: %t, "+
- "protoocl: %d, current data ID: %d, partition context: %p,
from: %d",
- connectionID, randomID, p.partitionNum, exist, protocol,
currentDataID, p, from)
if exist {
connection := conn.(*PartitionConnection)
connection.appendProtocolIfNeed(p.protocolMgr, connectionID,
randomID, protocol, currentDataID)
