mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
refactoring
This commit is contained in:
parent
66effaed9e
commit
8ed490164e
|
@ -70,12 +70,7 @@ func (broker *MessageBroker) Subscribe(stream messaging_pb.SeaweedMessaging_Subs
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
messageCount, err = lock.logBuffer.LoopProcessLogData(lastReadTime, func() bool {
|
eachLogEntryFn := func(logEntry *filer_pb.LogEntry) error {
|
||||||
lock.Mutex.Lock()
|
|
||||||
lock.cond.Wait()
|
|
||||||
lock.Mutex.Unlock()
|
|
||||||
return true
|
|
||||||
}, func(logEntry *filer_pb.LogEntry) error {
|
|
||||||
m := &messaging_pb.Message{}
|
m := &messaging_pb.Message{}
|
||||||
if err = proto.Unmarshal(logEntry.Data, m); err != nil {
|
if err = proto.Unmarshal(logEntry.Data, m); err != nil {
|
||||||
glog.Errorf("unexpected unmarshal messaging_pb.Message: %v", err)
|
glog.Errorf("unexpected unmarshal messaging_pb.Message: %v", err)
|
||||||
|
@ -87,7 +82,14 @@ func (broker *MessageBroker) Subscribe(stream messaging_pb.SeaweedMessaging_Subs
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
}
|
||||||
|
|
||||||
|
messageCount, err = lock.logBuffer.LoopProcessLogData(lastReadTime, func() bool {
|
||||||
|
lock.Mutex.Lock()
|
||||||
|
lock.cond.Wait()
|
||||||
|
lock.Mutex.Unlock()
|
||||||
|
return true
|
||||||
|
}, eachLogEntryFn)
|
||||||
|
|
||||||
return err
|
return err
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue