More logging

This commit is contained in:
9seconds
2018-07-08 13:24:48 +03:00
parent 76e88edac3
commit 474fb8a294
2 changed files with 14 additions and 11 deletions
+1
View File
@@ -7,6 +7,7 @@ type HandshakeRequest struct {
func (r *HandshakeRequest) Bytes() []byte { func (r *HandshakeRequest) Bytes() []byte {
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
buf.Grow(len(TagHandshake) + len(HandshakeFlags) + len(HandshakeSenderPID) + len(HandshakePeerPID))
buf.Write(TagHandshake) buf.Write(TagHandshake)
buf.Write(HandshakeFlags) buf.Write(HandshakeFlags)
+13 -11
View File
@@ -32,6 +32,10 @@ func (m *MTProtoProxy) Read() ([]byte, error) {
if err != nil { if err != nil {
return nil, errors.Annotate(err, "Cannot read packet") return nil, errors.Annotate(err, "Cannot read packet")
} }
defer func() {
m.readCounter++
}()
m.logger.Debugw("Read packet length", m.logger.Debugw("Read packet length",
"counter", m.readCounter, "counter", m.readCounter,
"simple_ack", m.req.Options.WriteHacks.SimpleAck, "simple_ack", m.req.Options.WriteHacks.SimpleAck,
@@ -44,14 +48,6 @@ func (m *MTProtoProxy) Read() ([]byte, error) {
} }
tag, packet := packet[:4], packet[4:] tag, packet := packet[:4], packet[4:]
m.logger.Debugw("Read RPC tag",
"counter", m.readCounter,
"simple_ack", m.req.Options.WriteHacks.SimpleAck,
"quick_ack", m.req.Options.WriteHacks.QuickAck,
"tag", tag,
)
m.readCounter++
switch { switch {
case bytes.Equal(tag, rpc.TagProxyAns): case bytes.Equal(tag, rpc.TagProxyAns):
return m.readProxyAns(packet) return m.readProxyAns(packet)
@@ -70,7 +66,10 @@ func (m *MTProtoProxy) readProxyAns(data []byte) ([]byte, error) {
} }
data = data[12:] data = data[12:]
m.logger.Debugw("Read RPC_PROXY_ANS", "length", len(data)) m.logger.Debugw("Read RPC_PROXY_ANS",
"counter", m.readCounter,
"length", len(data),
)
return data, nil return data, nil
} }
@@ -81,13 +80,16 @@ func (m *MTProtoProxy) readSimpleAck(data []byte) ([]byte, error) {
} }
data = data[8:12] data = data[8:12]
m.logger.Debugw("Read RPC_SIMPLE_ACK", "length", len(data)) m.logger.Debugw("Read RPC_SIMPLE_ACK",
"counter", m.readCounter,
"length", len(data),
)
return data, nil return data, nil
} }
func (m *MTProtoProxy) readCloseExt(data []byte) ([]byte, error) { func (m *MTProtoProxy) readCloseExt(data []byte) ([]byte, error) {
m.logger.Debugw("Read RPC_CLOSE_EXT") m.logger.Debugw("Read RPC_CLOSE_EXT", "counter", m.readCounter)
return nil, errors.New("Connection has been closed remotely by RPC call") return nil, errors.New("Connection has been closed remotely by RPC call")
} }