RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify ZeroMQ shutdown in attempt to avoid getting stuck occasionally

Browse Source
This commit is contained in:
Martin Boehm 2018-05-29 12:15:20 +02:00
parent 9147781772
commit c74c4dd8ff
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bchain/mq.go
View File

@ -14,6 +14,7 @@ type MQ struct {
socket *zmq.Socket socket *zmq.Socket
isRunning bool isRunning bool
finished chan bool finished chan bool
binding string
} }
// NotificationType is type of notification // NotificationType is type of notification
@ -56,7 +57,7 @@ func NewMQ(binding string, callback func(NotificationType)) (*MQ, error) {
return nil, err return nil, err
} }
glog.Info("MQ listening to ", binding) glog.Info("MQ listening to ", binding)
mq := &MQ{context, socket, true, make(chan bool)} mq := &MQ{context, socket, true, make(chan bool), binding}
go mq.run(callback) go mq.run(callback)
return mq, nil return mq, nil
} }
@ -91,6 +92,7 @@ func (mq *MQ) run(callback func(NotificationType)) {
break break
default: default:
nt = NotificationUnknown nt = NotificationUnknown
glog.Infof("MQ: NotificationUnknown %v", string(msg[0]))
} }
if glog.V(2) { if glog.V(2) {
sequence := uint32(0) sequence := uint32(0)
@ -108,9 +110,16 @@ func (mq *MQ) run(callback func(NotificationType)) {
func (mq *MQ) Shutdown() error { func (mq *MQ) Shutdown() error {
glog.Info("MQ server shutdown") glog.Info("MQ server shutdown")
if mq.isRunning { if mq.isRunning {
mq.socket.SetUnsubscribe("hashtx") // if errors in the closing sequence, let it close ungracefully
mq.socket.SetUnsubscribe("hashblock") if err := mq.socket.SetUnsubscribe("hashtx"); err != nil {
// if errors in socket.Close or context.Term, let it close ungracefully return err
}
if err := mq.socket.SetUnsubscribe("hashblock"); err != nil {
return err
}
if err := mq.socket.Unbind(mq.binding); err != nil {
return err
}
if err := mq.socket.Close(); err != nil { if err := mq.socket.Close(); err != nil {
return err return err
} }