From 6402a69fb92cba97de6524836340f08e49936f7b Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Mon, 31 Dec 2018 01:39:58 -0500
Subject: [PATCH] use the rehash log category consistently

---
 irc/server.go | 8 ++++----
 oragono.yaml  | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/irc/server.go b/irc/server.go
index e1e29ae0..d888d018 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -887,7 +887,7 @@ func (server *Server) loadDatastore(config *Config) error {
 
 	_, err := os.Stat(config.Datastore.Path)
 	if os.IsNotExist(err) {
-		server.logger.Warning("startup", "database does not exist, creating it", config.Datastore.Path)
+		server.logger.Warning("rehash", "database does not exist, creating it", config.Datastore.Path)
 		err = initializeDB(config.Datastore.Path)
 		if err != nil {
 			return err
@@ -902,7 +902,7 @@ func (server *Server) loadDatastore(config *Config) error {
 	}
 
 	// load *lines (from the datastores)
-	server.logger.Debug("startup", "Loading D/Klines")
+	server.logger.Debug("rehash", "Loading D/Klines")
 	server.loadDLines()
 	server.loadKLines()
 
@@ -974,7 +974,7 @@ func (server *Server) setupListeners(config *Config) (err error) {
 	}
 
 	if len(tlsListeners) == 0 {
-		server.logger.Warning("startup", "You are not exposing an SSL/TLS listening port. You should expose at least one port (typically 6697) to accept TLS connections")
+		server.logger.Warning("rehash", "You are not exposing an SSL/TLS listening port. You should expose at least one port (typically 6697) to accept TLS connections")
 	}
 
 	var usesStandardTLSPort bool
@@ -985,7 +985,7 @@ func (server *Server) setupListeners(config *Config) (err error) {
 		}
 	}
 	if 0 < len(tlsListeners) && !usesStandardTLSPort {
-		server.logger.Warning("startup", "Port 6697 is the standard TLS port for IRC. You should (also) expose port 6697 as a TLS port to ensure clients can connect securely")
+		server.logger.Warning("rehash", "Port 6697 is the standard TLS port for IRC. You should (also) expose port 6697 as a TLS port to ensure clients can connect securely")
 	}
 
 	return
diff --git a/oragono.yaml b/oragono.yaml
index 03ce36d4..ba54bbbd 100644
--- a/oragono.yaml
+++ b/oragono.yaml
@@ -340,6 +340,7 @@ logging:
         #   commands        command calling and operations
         #   opers           oper actions, authentication, etc
         #   password        password hashing and comparing
+        #   rehash          server startup and rehash events
         #   userinput       raw lines sent by users
         #   useroutput      raw lines sent to users
         type: "* -userinput -useroutput -localconnect -localconnect-ip"