From c50c267d3c6d70b818746814bbd23d5420a4fe96 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Mon, 10 Aug 2020 17:33:24 -0400 Subject: [PATCH 1/2] better debug logline for failed message building --- irc/client.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/irc/client.go b/irc/client.go index 7c81f91e..3d9945aa 100644 --- a/irc/client.go +++ b/irc/client.go @@ -1635,8 +1635,9 @@ func (session *Session) SendRawMessage(message ircmsg.IrcMessage, blocking bool) // assemble message line, err := message.LineBytesStrict(false, MaxLineLen) if err != nil { - logline := fmt.Sprintf("Error assembling message for sending: %v\n%s", err, debug.Stack()) - session.client.server.logger.Error("internal", logline) + errorParams := []string{"Error assembling message for sending", err.Error(), message.Command} + errorParams = append(errorParams, message.Params...) + session.client.server.logger.Error("internal", errorParams...) message = ircmsg.MakeMessage(nil, session.client.server.name, ERR_UNKNOWNERROR, "*", "Error assembling message for sending") line, _ := message.LineBytesStrict(false, 0) From 682f8f66c578e560627ef7794b465e8d3537e829 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Mon, 10 Aug 2020 18:14:04 -0400 Subject: [PATCH 2/2] add compiler version to INFO output --- irc/handlers.go | 1 + 1 file changed, 1 insertion(+) diff --git a/irc/handlers.go b/irc/handlers.go index e398209d..77e67c83 100644 --- a/irc/handlers.go +++ b/irc/handlers.go @@ -1083,6 +1083,7 @@ func infoHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp rb.Add(nil, server.name, RPL_INFO, nick, fmt.Sprintf(client.t("This is Oragono version %s."), SemVer)) if Commit != "" { rb.Add(nil, server.name, RPL_INFO, nick, fmt.Sprintf(client.t("It was built from git hash %s."), Commit)) + rb.Add(nil, server.name, RPL_INFO, nick, fmt.Sprintf(client.t("It was compiled using %s."), runtime.Version())) } rb.Add(nil, server.name, RPL_INFO, nick, "") rb.Add(nil, server.name, RPL_INFO, nick, client.t("Oragono is released under the MIT license."))