From b494c1ec351781a9cc056e0c1d597635b842db84 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Mon, 18 May 2020 11:25:49 -0400
Subject: [PATCH 1/2] make it clearer when rehash has completed

---
 irc/handlers.go | 12 ++++++++----
 irc/server.go   | 14 +++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/irc/handlers.go b/irc/handlers.go
index 513864b4..d8f89d19 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -2238,14 +2238,18 @@ func quitHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp
 
 // REHASH
 func rehashHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool {
-	server.logger.Info("server", fmt.Sprintf("REHASH command used by %s", client.nick))
+	nick := client.Nick()
+	server.logger.Info("server", "REHASH command used by", nick)
 	err := server.rehash()
 
 	if err == nil {
-		rb.Add(nil, server.name, RPL_REHASHING, client.nick, "ircd.yaml", client.t("Rehashing"))
+		// we used to send RPL_REHASHING here but i don't think it really makes sense
+		// in the labeled-response world, since the intent is "rehash in progress" but
+		// it won't display until the rehash is actually complete
+		// TODO all operators should get a notice of some kind here
+		rb.Notice(client.t("Rehash complete"))
 	} else {
-		server.logger.Error("server", fmt.Sprintln("Failed to rehash:", err.Error()))
-		rb.Add(nil, server.name, ERR_UNKNOWNERROR, client.nick, "REHASH", err.Error())
+		rb.Add(nil, server.name, ERR_UNKNOWNERROR, nick, "REHASH", err.Error())
 	}
 	return false
 }
diff --git a/irc/server.go b/irc/server.go
index 7c5bebc0..2ac30426 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -141,10 +141,7 @@ func (server *Server) Run() {
 		case <-server.rehashSignal:
 			go func() {
 				server.logger.Info("server", "Rehashing due to SIGHUP")
-				err := server.rehash()
-				if err != nil {
-					server.logger.Error("server", fmt.Sprintln("Failed to rehash:", err.Error()))
-				}
+				server.rehash()
 			}()
 		}
 	}
@@ -451,7 +448,7 @@ func (client *Client) rplWhoReply(channel *Channel, target *Client, rb *Response
 
 // rehash reloads the config and applies the changes from the config file.
 func (server *Server) rehash() error {
-	server.logger.Debug("server", "Starting rehash")
+	server.logger.Info("server", "Starting rehash")
 
 	// only let one REHASH go on at a time
 	server.rehashMutex.Lock()
@@ -461,14 +458,17 @@ func (server *Server) rehash() error {
 
 	config, err := LoadConfig(server.configFilename)
 	if err != nil {
-		return fmt.Errorf("Error loading config file config: %s", err.Error())
+		server.logger.Error("server", "failed to load config file", err.Error())
+		return err
 	}
 
 	err = server.applyConfig(config)
 	if err != nil {
-		return fmt.Errorf("Error applying config changes: %s", err.Error())
+		server.logger.Error("server", "Failed to rehash", err.Error())
+		return err
 	}
 
+	server.logger.Info("server", "Rehash completed successfully")
 	return nil
 }
 

From a95c44696f2a6fe303c9d4bb840518a38ec7b3f0 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Mon, 18 May 2020 12:33:26 -0400
Subject: [PATCH 2/2] review fix

---
 irc/server.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/irc/server.go b/irc/server.go
index 2ac30426..053d5d3a 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -448,7 +448,7 @@ func (client *Client) rplWhoReply(channel *Channel, target *Client, rb *Response
 
 // rehash reloads the config and applies the changes from the config file.
 func (server *Server) rehash() error {
-	server.logger.Info("server", "Starting rehash")
+	server.logger.Info("server", "Attempting rehash")
 
 	// only let one REHASH go on at a time
 	server.rehashMutex.Lock()