fixed bug #96
This commit is contained in:
1 parent
481a61c520
commit
b8bacb4c3d
4 files changed
+15
-6
No files matched your search
+2
-1
@@ -1,4 +1,5 @@
|
||||
hmq
|
||||
log
|
||||
log/*
|
||||
*.test
|
||||
*.test
|
||||
.vscode/settings.json
|
||||
Vendored
+3
@@ -4,5 +4,8 @@
|
||||
"--enable=errcheck,varcheck,deadcode",
|
||||
"--enable=varcheck",
|
||||
"--enable=deadcode"
|
||||
],
|
||||
"cSpell.words": [
|
||||
"Authorised"
|
||||
]
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
FROM golang:1.12 as builder
|
||||
FROM golang:1.14 as builder
|
||||
WORKDIR /go/src/github.com/fhmq/hmq
|
||||
COPY . .
|
||||
RUN CGO_ENABLED=0 go build -o hmq -a -ldflags '-extldflags "-static"' .
|
||||
|
||||
+9
-4
@@ -88,8 +88,8 @@ type route struct {
|
||||
}
|
||||
|
||||
var (
|
||||
DisconnectdPacket = packets.NewControlPacket(packets.Disconnect).(*packets.DisconnectPacket)
|
||||
r = rand.New(rand.NewSource(time.Now().UnixNano()))
|
||||
DisconnectedPacket = packets.NewControlPacket(packets.Disconnect).(*packets.DisconnectPacket)
|
||||
r = rand.New(rand.NewSource(time.Now().UnixNano()))
|
||||
)
|
||||
|
||||
func (c *client) init() {
|
||||
@@ -131,7 +131,7 @@ func (c *client) readLoop() {
|
||||
log.Error("set read timeout error: ", zap.Error(err), zap.String("ClientID", c.info.clientID))
|
||||
msg := &Message{
|
||||
client: c,
|
||||
packet: DisconnectdPacket,
|
||||
packet: DisconnectedPacket,
|
||||
}
|
||||
b.SubmitWork(c.info.clientID, msg)
|
||||
return
|
||||
@@ -143,7 +143,7 @@ func (c *client) readLoop() {
|
||||
log.Error("read packet error: ", zap.Error(err), zap.String("ClientID", c.info.clientID))
|
||||
msg := &Message{
|
||||
client: c,
|
||||
packet: DisconnectdPacket,
|
||||
packet: DisconnectedPacket,
|
||||
}
|
||||
b.SubmitWork(c.info.clientID, msg)
|
||||
return
|
||||
@@ -662,6 +662,11 @@ func (c *client) Close() {
|
||||
}
|
||||
|
||||
func (c *client) WriterPacket(packet packets.ControlPacket) error {
|
||||
defer func() {
|
||||
if err := recover(); err != nil {
|
||||
log.Error("recover error, ", zap.Any("recover", r))
|
||||
}
|
||||
}()
|
||||
if c.status == Disconnected {
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user