Add .conf file location fallback to current folder

billy1arm · billy1arm · commit 2fc62e8b3f5a · 2026-03-01T23:42:24.000Z
diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
@@ -437,11 +437,16 @@ bool AuctionBotConfig::Initialize()
 {
     if (!m_AhBotCfg.SetSource(m_configFileName.c_str()))
     {
-        sLog.outString("AHBOT is Disabled. Unable to open configuration file %s. ", m_configFileName.c_str());
-        setConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO, 0);
-        setConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO, 0);
-        setConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO, 0);
-        return false;
+        // Try current folder as fallback
+        if (!m_AhBotCfg.SetSource(AUCTIONHOUSEBOT_CONFIG_NAME))
+        {
+            sLog.outString("AHBOT is Disabled. Unable to open configuration file %s. ", m_configFileName.c_str());
+            setConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO, 0);
+            setConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO, 0);
+            setConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO, 0);
+            return false;
+        }
+        m_configFileName = AUCTIONHOUSEBOT_CONFIG_NAME;
     }
     else
     {
diff --git a/src/mangosd/mangosd.cpp b/src/mangosd/mangosd.cpp
@@ -371,12 +371,17 @@ int main(int argc, char** argv)
 #endif
     if (!sConfig.SetSource(cfg_file))
     {
-        sLog.outError("Could not find configuration file %s.", cfg_file);
-        Log::WaitBeforeContinueIfNeed();
-        return 1;
+        // Try current folder as fallback if SYSCONFDIR path fails
+        if (!sConfig.SetSource(MANGOSD_CONFIG_NAME))
+        {
+            sLog.outError("Could not find configuration file %s.", cfg_file);
+            Log::WaitBeforeContinueIfNeed();
+            return 1;
+        }
+        cfg_file = MANGOSD_CONFIG_NAME;
     }
 
-#ifndef _WIN32                                               // posix daemon commands need apply after config read
+#ifndef _WIN32
     switch (serviceDaemonMode)
     {
         case 'r':
diff --git a/src/modules/Bots/ahbot/AhBotConfig.cpp b/src/modules/Bots/ahbot/AhBotConfig.cpp
@@ -31,8 +31,12 @@ bool AhBotConfig::Initialize()
 {
     if (!config.SetSource(AUCTIONHOUSEBOT_CONFIG_NAME))
     {
-        sLog.outString("AhBot is Disabled. Unable to open configuration file ahbot.conf");
-        return false;
+        // Try current folder as fallback
+        if (!config.SetSource("ahbot.conf"))
+        {
+            sLog.outString("AhBot is Disabled. Unable to open configuration file ahbot.conf");
+            return false;
+        }
     }
 
     enabled = config.GetBoolDefault("AhBot.Enabled", false);
diff --git a/src/modules/Bots/playerbot/PlayerbotAIConfig.cpp b/src/modules/Bots/playerbot/PlayerbotAIConfig.cpp
@@ -103,8 +103,12 @@ bool PlayerbotAIConfig::Initialize()
 
     if (!config.SetSource(SYSCONFDIR"aiplayerbot.conf"))
     {
-        sLog.outString("AI Playerbot is Disabled. Unable to open configuration file aiplayerbot.conf");
-        return false;
+        // Try current folder as fallback
+        if (!config.SetSource("aiplayerbot.conf"))
+        {
+            sLog.outString("AI Playerbot is Disabled. Unable to open configuration file aiplayerbot.conf");
+            return false;
+        }
     }
 
     enabled = config.GetBoolDefault("AiPlayerbot.Enabled", true);
diff --git a/src/realmd b/src/realmd
@@ -1 +1 @@
-Subproject commit 0b64e907e633e801854108db272943ef3ac82ee6
+Subproject commit 42614f4eaeb5cbab808acaaf17483b7e89e825c2

Original file line number	Diff line number	Diff line change
`@@ -437,11 +437,16 @@ bool AuctionBotConfig::Initialize()`
`437`	`437`	`{`
`438`	`438`	`if (!m_AhBotCfg.SetSource(m_configFileName.c_str()))`
`439`	`439`	`{`
`440`		`- sLog.outString("AHBOT is Disabled. Unable to open configuration file %s. ", m_configFileName.c_str());`
`441`		`- setConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO, 0);`
`442`		`- setConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO, 0);`
`443`		`- setConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO, 0);`
`444`		`- return false;`
	`440`	`+ // Try current folder as fallback`
	`441`	`+ if (!m_AhBotCfg.SetSource(AUCTIONHOUSEBOT_CONFIG_NAME))`
	`442`	`+ {`
	`443`	`+ sLog.outString("AHBOT is Disabled. Unable to open configuration file %s. ", m_configFileName.c_str());`
	`444`	`+ setConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO, 0);`
	`445`	`+ setConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO, 0);`
	`446`	`+ setConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO, 0);`
	`447`	`+ return false;`
	`448`	`+ }`
	`449`	`+ m_configFileName = AUCTIONHOUSEBOT_CONFIG_NAME;`
`445`	`450`	`}`
`446`	`451`	`else`
`447`	`452`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,12 @@ bool AhBotConfig::Initialize()`
`31`	`31`	`{`
`32`	`32`	`if (!config.SetSource(AUCTIONHOUSEBOT_CONFIG_NAME))`
`33`	`33`	`{`
`34`		`- sLog.outString("AhBot is Disabled. Unable to open configuration file ahbot.conf");`
`35`		`- return false;`
	`34`	`+ // Try current folder as fallback`
	`35`	`+ if (!config.SetSource("ahbot.conf"))`
	`36`	`+ {`
	`37`	`+ sLog.outString("AhBot is Disabled. Unable to open configuration file ahbot.conf");`
	`38`	`+ return false;`
	`39`	`+ }`
`36`	`40`	`}`
`37`	`41`
`38`	`42`	`enabled = config.GetBoolDefault("AhBot.Enabled", false);`
Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,12 @@ bool PlayerbotAIConfig::Initialize()`
`103`	`103`
`104`	`104`	`if (!config.SetSource(SYSCONFDIR"aiplayerbot.conf"))`
`105`	`105`	`{`
`106`		`- sLog.outString("AI Playerbot is Disabled. Unable to open configuration file aiplayerbot.conf");`
`107`		`- return false;`
	`106`	`+ // Try current folder as fallback`
	`107`	`+ if (!config.SetSource("aiplayerbot.conf"))`
	`108`	`+ {`
	`109`	`+ sLog.outString("AI Playerbot is Disabled. Unable to open configuration file aiplayerbot.conf");`
	`110`	`+ return false;`
	`111`	`+ }`
`108`	`112`	`}`
`109`	`113`
`110`	`114`	`enabled = config.GetBoolDefault("AiPlayerbot.Enabled", true);`