sad
/
soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename AppendLog to appendLog 

This function is only safe to call from inside the user goroutine. Let's
make it private.
This commit is contained in:
Simon Ser 2020-03-31 17:30:45 +02:00
parent aadeb327d3
commit 1023c2ebfc
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
upstream.go
View File

@ -322,7 +322,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
if nick == uc.nick { if nick == uc.nick {
target = msg.Prefix.Name target = msg.Prefix.Name
} }
uc.AppendLog(target, "<%s> %s", msg.Prefix.Name, text) uc.appendLog(target, "<%s> %s", msg.Prefix.Name, text)
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstream(func(dc *downstreamConn) {
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
@ -627,7 +627,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
if membership, ok := ch.Members[msg.Prefix.Name]; ok { if membership, ok := ch.Members[msg.Prefix.Name]; ok {
delete(ch.Members, msg.Prefix.Name) delete(ch.Members, msg.Prefix.Name)
ch.Members[newNick] = membership ch.Members[newNick] = membership
uc.AppendLog(ch.Name, "*** %s is now known as %s", msg.Prefix.Name, newNick) uc.appendLog(ch.Name, "*** %s is now known as %s", msg.Prefix.Name, newNick)
} }
} }
@ -671,7 +671,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
ch.Members[msg.Prefix.Name] = nil ch.Members[msg.Prefix.Name] = nil
} }
uc.AppendLog(ch, "*** Joins: %s (%s@%s)", msg.Prefix.Name, msg.Prefix.User, msg.Prefix.Host) uc.appendLog(ch, "*** Joins: %s (%s@%s)", msg.Prefix.Name, msg.Prefix.User, msg.Prefix.Host)
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstream(func(dc *downstreamConn) {
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
@ -708,7 +708,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
delete(ch.Members, msg.Prefix.Name) delete(ch.Members, msg.Prefix.Name)
} }
uc.AppendLog(ch, "*** Parts: %s (%s@%s) (%s)", msg.Prefix.Name, msg.Prefix.User, msg.Prefix.Host, reason) uc.appendLog(ch, "*** Parts: %s (%s@%s) (%s)", msg.Prefix.Name, msg.Prefix.User, msg.Prefix.Host, reason)
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstream(func(dc *downstreamConn) {
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
@ -744,7 +744,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
delete(ch.Members, user) delete(ch.Members, user)
} }
uc.AppendLog(channel, "*** %s was kicked by %s (%s)", user, msg.Prefix.Name, reason) uc.appendLog(channel, "*** %s was kicked by %s (%s)", user, msg.Prefix.Name, reason)
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstream(func(dc *downstreamConn) {
params := []string{dc.marshalChannel(uc, channel), dc.marshalNick(uc, user)} params := []string{dc.marshalChannel(uc, channel), dc.marshalNick(uc, user)}
@ -775,7 +775,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
if _, ok := ch.Members[msg.Prefix.Name]; ok { if _, ok := ch.Members[msg.Prefix.Name]; ok {
delete(ch.Members, msg.Prefix.Name) delete(ch.Members, msg.Prefix.Name)
uc.AppendLog(ch.Name, "*** Quits: %s (%s@%s) (%s)", msg.Prefix.Name, msg.Prefix.User, msg.Prefix.Host, reason) uc.appendLog(ch.Name, "*** Quits: %s (%s@%s) (%s)", msg.Prefix.Name, msg.Prefix.User, msg.Prefix.Host, reason)
} }
} }
@ -855,7 +855,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
for _, v := range msg.Params[2:] { for _, v := range msg.Params[2:] {
modeMsg += " " + v modeMsg += " " + v
} }
uc.AppendLog(ch.Name, "*** %s sets mode: %s", msg.Prefix.Name, modeMsg) uc.appendLog(ch.Name, "*** %s sets mode: %s", msg.Prefix.Name, modeMsg)
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstream(func(dc *downstreamConn) {
params := []string{dc.marshalChannel(uc, name), modeStr} params := []string{dc.marshalChannel(uc, name), modeStr}
@ -1208,7 +1208,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
if nick == uc.nick { if nick == uc.nick {
target = msg.Prefix.Name target = msg.Prefix.Name
} }
uc.AppendLog(target, "<%s> %s", msg.Prefix.Name, text) uc.appendLog(target, "<%s> %s", msg.Prefix.Name, text)
uc.network.ring.Produce(msg) uc.network.ring.Produce(msg)
case "INVITE": case "INVITE":
@ -1411,7 +1411,7 @@ func (uc *upstreamConn) SendMessageLabeled(downstreamID uint64, msg *irc.Message
} }
// TODO: handle moving logs when a network name changes, when support for this is added // TODO: handle moving logs when a network name changes, when support for this is added
func (uc *upstreamConn) AppendLog(entity string, format string, a ...interface{}) { func (uc *upstreamConn) appendLog(entity string, format string, a ...interface{}) {
if uc.srv.LogPath == "" { if uc.srv.LogPath == "" {
return return
} }