From ed8abaa6e0d7741b16689e650f2cb7995ad72ce5 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 11 Jun 2024 12:24:01 +0100
Subject: Fix some references to --debug that should be --protocoldebug now.

---
 make/template/inspircd   |  8 ++++----
 make/template/inspircd.1 | 10 +++++++---
 src/logging.cpp          |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/make/template/inspircd b/make/template/inspircd
index b4b8bde40..c9bbc7695 100644
--- a/make/template/inspircd
+++ b/make/template/inspircd
@@ -72,7 +72,7 @@ my @gdbargs = (
 	'--eval-command', 'set pagination off',
 	'--eval-command', 'handle all nostop pass print',
 	'--eval-command', 'run',
-	'--args', "$binpath/$executable", qw(--nofork --nolog --debug)
+	'--args', "$binpath/$executable", qw(--nofork --nolog --protocoldebug)
 );
 
 sub expand_fragment($$) {
@@ -248,7 +248,7 @@ sub dev_valdebug(@)
 	# If we are still alive here.. Try starting the IRCd..
 	# May want to do something with these args at some point: --suppressions=.inspircd.sup --gen-suppressions=yes
 	# Could be useful when we want to stop it complaining about things we're sure aren't issues.
-	exec qw(valgrind -v --tool=memcheck --leak-check=yes --num-callers=30), "$binpath/$executable", qw(--nofork --debug --nolog), @_;
+	exec qw(valgrind -v --tool=memcheck --leak-check=yes --num-callers=30), "$binpath/$executable", qw(--nofork --nolog --protocoldebug), @_;
 	die "Failed to start valgrind: $!\n";
 }
 
@@ -283,7 +283,7 @@ sub dev_valdebug_unattended(@)
 		exec qw(valgrind -v --tool=memcheck --leak-check=full --show-reachable=yes --num-callers=30 --track-fds=yes),
 			"--suppressions=$binpath/valgrind.sup", qw(--gen-suppressions=all),
 			qw(--leak-resolution=med --time-stamp=yes --log-fd=2 --),
-			"$binpath/$executable", qw(--nofork --debug --nolog), @_;
+			"$binpath/$executable", qw(--nofork --nolog --protocoldebug), @_;
 		die "Can't execute valgrind: $!\n";
 	}
 }
@@ -304,7 +304,7 @@ sub dev_screenvaldebug(@)
 	# If we are still alive here.. Try starting the IRCd..
 	print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the valgrind and gdb output and get a backtrace.\n";
 	print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
-	exec qw(screen -m -d valgrind -v --tool=memcheck --leak-check=yes --num-callers=30), "$binpath/$executable", qw(--nofork --debug --nolog), @_;
+	exec qw(screen -m -d valgrind -v --tool=memcheck --leak-check=yes --num-callers=30), "$binpath/$executable", qw(--nofork --nolog --protocoldebug), @_;
 	die "Failed to start screen: $!\n";
 }
 
diff --git a/make/template/inspircd.1 b/make/template/inspircd.1
index 8c7425df5..01d5d0de6 100644
--- a/make/template/inspircd.1
+++ b/make/template/inspircd.1
@@ -17,14 +17,14 @@
 .\"
 
 
-.TH "InspIRCd" "1" "2018-08-24" "InspIRCd @VERSION_FULL@" "InspIRCd Manual"
+.TH "InspIRCd" "1" "2024-06-11" "InspIRCd @VERSION_FULL@" "InspIRCd Manual"
 
 .SH "NAME"
 \t\fBInspIRCd\fR - \fIthe\fR stable, high-performance and modular Internet Relay Chat Daemon
 .BR
 
 .SH "SYNOPSIS"
-\t\fBinspircd\fR [--config <file>] [--debug] [--nofork] [--nolog] [--nopid] [--runasroot] [--version]
+\t\fBinspircd\fR [--config <file>] [--debug] [--nofork] [--nolog] [--nopid] [--protocoldebug] [--runasroot] [--version]
 
 .SH "OPTIONS"
 .TP
@@ -34,7 +34,7 @@ Sets the path to the main configuration file. Defaults to \fI@CONFIG_DIR@/inspir
 .TP
 .B "--debug"
 .br
-Log verbosely to the standard output stream.
+Log at the debug level to the standard output stream.
 .TP
 .B "--nofork"
 .br
@@ -48,6 +48,10 @@ Don't write to log files.
 .br
 Don't write to the PID file.
 .TP
+.B "--protocoldebug"
+.br
+Log at the raw I/O level to the standard output stream.
+.TP
 .B "--runasroot"
 .br
 Allow the server to start as root (not recommended).
diff --git a/src/logging.cpp b/src/logging.cpp
index 3edda5005..68d214668 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -217,7 +217,7 @@ void Log::Manager::OpenLogs(bool requiremethods)
 	// If the server is started in debug mode we don't write logs.
 	if (ServerInstance->Config->CommandLine.forcedebug)
 	{
-		Normal("LOG", "Not opening loggers because we were started with --debug");
+		Normal("LOG", "Not opening loggers because we were started with --(protocol)debug");
 		return;
 	}
 
-- 
cgit v1.3.1-10-gc9f91