Reorder stopping messages so that logs are coherent

This commit is contained in:
Jason A. Donenfeld 2018-05-05 06:09:30 +02:00
parent a46401bbb1
commit c29428b075
2 changed files with 6 additions and 6 deletions

View file

@ -238,8 +238,8 @@ func (device *Device) RoutineDecryption() {
logDebug := device.log.Debug logDebug := device.log.Debug
defer func() { defer func() {
device.state.stopping.Done()
logDebug.Println("Routine: decryption worker - stopped") logDebug.Println("Routine: decryption worker - stopped")
device.state.stopping.Done()
}() }()
logDebug.Println("Routine: decryption worker - started") logDebug.Println("Routine: decryption worker - started")
@ -304,8 +304,8 @@ func (device *Device) RoutineHandshake() {
logDebug := device.log.Debug logDebug := device.log.Debug
defer func() { defer func() {
device.state.stopping.Done()
logDebug.Println("Routine: handshake worker - stopped") logDebug.Println("Routine: handshake worker - stopped")
device.state.stopping.Done()
}() }()
logDebug.Println("Routine: handshake worker - started") logDebug.Println("Routine: handshake worker - started")
@ -534,8 +534,8 @@ func (peer *Peer) RoutineSequentialReceiver() {
logDebug := device.log.Debug logDebug := device.log.Debug
defer func() { defer func() {
peer.routines.stopping.Done()
logDebug.Println(peer, ": Routine: sequential receiver - stopped") logDebug.Println(peer, ": Routine: sequential receiver - stopped")
peer.routines.stopping.Done()
}() }()
logDebug.Println(peer, ": Routine: sequential receiver - started") logDebug.Println(peer, ": Routine: sequential receiver - started")

View file

@ -200,8 +200,8 @@ func (peer *Peer) RoutineNonce() {
logDebug := device.log.Debug logDebug := device.log.Debug
defer func() { defer func() {
peer.routines.stopping.Done()
logDebug.Println(peer, ": Routine: nonce worker - stopped") logDebug.Println(peer, ": Routine: nonce worker - stopped")
peer.routines.stopping.Done()
}() }()
peer.routines.starting.Done() peer.routines.starting.Done()
@ -274,8 +274,8 @@ func (device *Device) RoutineEncryption() {
logDebug := device.log.Debug logDebug := device.log.Debug
defer func() { defer func() {
device.state.stopping.Done()
logDebug.Println("Routine: encryption worker - stopped") logDebug.Println("Routine: encryption worker - stopped")
device.state.stopping.Done()
}() }()
logDebug.Println("Routine: encryption worker - started") logDebug.Println("Routine: encryption worker - started")
@ -348,8 +348,8 @@ func (peer *Peer) RoutineSequentialSender() {
logDebug := device.log.Debug logDebug := device.log.Debug
defer func() { defer func() {
peer.routines.stopping.Done()
logDebug.Println(peer, ": Routine: sequential sender - stopped") logDebug.Println(peer, ": Routine: sequential sender - stopped")
peer.routines.stopping.Done()
}() }()
logDebug.Println(peer, ": Routine: sequential sender - started") logDebug.Println(peer, ": Routine: sequential sender - started")