nmdc-log-service: prevent logging the same connection-state message repeatedly
This commit is contained in:
parent
2113139cdc
commit
ed64887ddc
@ -51,7 +51,11 @@ func LogMessage(hub, message string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func HubWorker(addr, nick, password string) {
|
type HubWorker struct {
|
||||||
|
LastConnectionStateMessage string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (this *HubWorker) MainLoop(addr, nick, password string) {
|
||||||
|
|
||||||
opts := libnmdc.HubConnectionOptions{
|
opts := libnmdc.HubConnectionOptions{
|
||||||
Address: libnmdc.HubAddress(addr),
|
Address: libnmdc.HubAddress(addr),
|
||||||
@ -71,11 +75,16 @@ func HubWorker(addr, nick, password string) {
|
|||||||
switch event.EventType {
|
switch event.EventType {
|
||||||
case libnmdc.EVENT_CONNECTION_STATE_CHANGED:
|
case libnmdc.EVENT_CONNECTION_STATE_CHANGED:
|
||||||
if LogConnectionState {
|
if LogConnectionState {
|
||||||
|
str := "* " + event.StateChange.Format()
|
||||||
if len(event.Message) > 0 {
|
if len(event.Message) > 0 {
|
||||||
LogMessage(addr, "* "+event.StateChange.Format()+" ("+event.Message+")")
|
str += " (" + event.Message + ")"
|
||||||
} else {
|
|
||||||
LogMessage(addr, "* "+event.StateChange.Format())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Prevent logging the same message repeatedly
|
||||||
|
if str != this.LastConnectionStateMessage {
|
||||||
|
LogMessage(addr, str)
|
||||||
|
}
|
||||||
|
this.LastConnectionStateMessage = str
|
||||||
}
|
}
|
||||||
|
|
||||||
case libnmdc.EVENT_PUBLIC:
|
case libnmdc.EVENT_PUBLIC:
|
||||||
@ -135,7 +144,8 @@ func main() {
|
|||||||
os.MkdirAll(GetDirectoryNameForHub(hubaddr), 0755)
|
os.MkdirAll(GetDirectoryNameForHub(hubaddr), 0755)
|
||||||
|
|
||||||
// Launch logger
|
// Launch logger
|
||||||
go HubWorker(hubaddr, *nick, *password)
|
hw := HubWorker{}
|
||||||
|
go hw.MainLoop(hubaddr, *nick, *password)
|
||||||
|
|
||||||
launch_ct++
|
launch_ct++
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user