Change allocation of InspIRCd::Logs to be physically part of the object containing it using fakederef

2 files changed, 6 insertions, 11 deletions

diff --git a/src/base.cpp b/src/base.cpp
index dc57a8434..c131f4dae 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -27,13 +27,13 @@
 
 classbase::classbase()
 {
-	if (ServerInstance && ServerInstance->Logs)
+	if (ServerInstance)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::+ @%p", (void*)this);
 }
 
 CullResult classbase::cull()
 {
-	if (ServerInstance && ServerInstance->Logs)
+	if (ServerInstance)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::-%s @%p",
 			typeid(*this).name(), (void*)this);
 	return CullResult();
@@ -41,7 +41,7 @@ CullResult classbase::cull()
 
 classbase::~classbase()
 {
-	if (ServerInstance && ServerInstance->Logs)
+	if (ServerInstance)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::~ @%p", (void*)this);
 }
 
@@ -73,14 +73,14 @@ refcountbase::refcountbase() : refcount(0)
 
 refcountbase::~refcountbase()
 {
-	if (refcount && ServerInstance && ServerInstance->Logs)
+	if (refcount && ServerInstance)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "refcountbase::~ @%p with refcount %d",
 			(void*)this, refcount);
 }
 
 usecountbase::~usecountbase()
 {
-	if (usecount && ServerInstance && ServerInstance->Logs)
+	if (usecount && ServerInstance)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "usecountbase::~ @%p with refcount %d",
 			(void*)this, usecount);
 }
@@ -197,7 +197,7 @@ void Extensible::FreeAllExtItems()
 
 Extensible::~Extensible()
 {
-	if ((!extensions.empty() || !culled) && ServerInstance && ServerInstance->Logs)
+	if ((!extensions.empty() || !culled) && ServerInstance)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Extensible destructor called without cull @%p", (void*)this);
 }
 
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 8d0b8a649..585abd0c7 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -131,7 +131,6 @@ void InspIRCd::Cleanup()
 	DeleteZero(this->Config);
 	SocketEngine::Deinit();
 	Logs->CloseLogs();
-	DeleteZero(this->Logs);
 }
 
 void InspIRCd::SetSignals()
@@ -250,7 +249,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	    do_nolog = 0, do_root = 0;
 
 	// Initialize so that if we exit before proper initialization they're not deleted
-	this->Logs = 0;
 	this->Users = 0;
 	this->Config = 0;
 	this->SNO = 0;
@@ -262,9 +260,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	UpdateTime();
 	this->startup_time = TIME.tv_sec;
 
-	// This must be created first, so other parts of Insp can use it while starting up
-	this->Logs = new LogManager;
-
 	SocketEngine::Init();
 
 	// Create base manager classes early, so nothing breaks