1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 23:47:07 -05:00

more informational logs

This commit is contained in:
Darien Raymond 2017-12-27 21:39:14 +01:00
parent 8a09c6c926
commit 9b15e2f6f7
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169

View File

@ -201,7 +201,7 @@ type Connection struct {
// NewConnection create a new KCP connection between local and remote. // NewConnection create a new KCP connection between local and remote.
func NewConnection(meta ConnMetadata, writer PacketWriter, closer io.Closer, config *Config) *Connection { func NewConnection(meta ConnMetadata, writer PacketWriter, closer io.Closer, config *Config) *Connection {
newError("creating connection ", meta.Conversation).WriteToLog() newError("#", meta.Conversation, " creating connection to ", meta.RemoteAddr).WriteToLog()
conn := &Connection{ conn := &Connection{
meta: meta, meta: meta,
@ -434,7 +434,7 @@ func (c *Connection) Close() error {
c.SetState(StateTerminated) c.SetState(StateTerminated)
} }
newError("closing connection to ", c.meta.RemoteAddr).WriteToLog() newError("#", c.meta.Conversation, " closing connection to ", c.meta.RemoteAddr).WriteToLog()
return nil return nil
} }
@ -460,10 +460,7 @@ func (c *Connection) SetDeadline(t time.Time) error {
if err := c.SetReadDeadline(t); err != nil { if err := c.SetReadDeadline(t); err != nil {
return err return err
} }
if err := c.SetWriteDeadline(t); err != nil { return c.SetWriteDeadline(t)
return err
}
return nil
} }
// SetReadDeadline implements the Conn SetReadDeadline method. // SetReadDeadline implements the Conn SetReadDeadline method.
@ -493,7 +490,7 @@ func (c *Connection) Terminate() {
if c == nil { if c == nil {
return return
} }
newError("terminating connection to ", c.RemoteAddr()).WriteToLog() newError("#", c.meta.Conversation, " terminating connection to ", c.RemoteAddr()).WriteToLog()
//v.SetState(StateTerminated) //v.SetState(StateTerminated)
c.dataInput.Signal() c.dataInput.Signal()