Merge branch 'insp4' into master.

3 files changed, 3 insertions, 11 deletions

diff --git a/modules/chancreate.cpp b/modules/chancreate.cpp
index 771ff8935..ca64e1ae9 100644
--- a/modules/chancreate.cpp
+++ b/modules/chancreate.cpp
@@ -42,7 +42,8 @@ public:
 	{
 		if ((created) && (IS_LOCAL(memb->user)))
 		{
-			ServerInstance->SNO.WriteGlobalSno('j', "Channel {} created by {}", memb->chan->name, memb->user->GetRealMask());
+			ServerInstance->SNO.WriteGlobalSno('j', "Channel {} created by {} [{}]",
+				memb->chan->name, memb->user->GetRealMask(), memb->user->GetAddress());
 		}
 	}
 };
diff --git a/modules/core/core_oper/cmd_die.cpp b/modules/core/core_oper/cmd_die.cpp
index 2bd99d722..052792898 100644
--- a/modules/core/core_oper/cmd_die.cpp
+++ b/modules/core/core_oper/cmd_die.cpp
@@ -65,10 +65,5 @@ CmdResult CommandDie::Handle(User* user, const Params& parameters)
 		DieRestart::SendError(diebuf);
 		ServerInstance->Exit(EXIT_FAILURE);
 	}
-	else
-	{
-		ServerInstance->Logs.Critical(MODNAME, "Failed /DIE command from {}", user->GetRealMask());
-		ServerInstance->SNO.WriteGlobalSno('a', "Failed DIE command from {}.", user->GetRealMask());
-		return CmdResult::FAILURE;
-	}
+	return CmdResult::FAILURE;
 }
diff --git a/modules/core/core_oper/cmd_restart.cpp b/modules/core/core_oper/cmd_restart.cpp
index f5506edb3..8f988fa4e 100644
--- a/modules/core/core_oper/cmd_restart.cpp
+++ b/modules/core/core_oper/cmd_restart.cpp
@@ -69,9 +69,5 @@ CmdResult CommandRestart::Handle(User* user, const Params& parameters)
 		ServerInstance->SNO.WriteGlobalSno('a', "Failed RESTART - could not execute '{}' ({})",
 			ServerInstance->Config->CommandLine.argv[0], strerror(errno));
 	}
-	else
-	{
-		ServerInstance->SNO.WriteGlobalSno('a', "Failed RESTART Command from {}.", user->GetRealMask());
-	}
 	return CmdResult::FAILURE;
 }