Skip to content

Commit 7b0d1f0

Browse files
authored
Core/Misc: Minor corrections to urls and grammar in logs and comments (#30917)
1 parent da2adb6 commit 7b0d1f0

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

src/common/Banner.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void Trinity::Banner::Show(char const* applicationName, void(*log)(char const* t
3131
log(R"( \ \_\ \_\ \ \_\ \_\ \_\ \_\ \__\\/`____ \)");
3232
log(R"( \/_/\/_/ \/_/\/_/\/_/\/_/\/__/ `/___/> \)");
3333
log(R"( C O R E /\___/)");
34-
log(R"(http://TrinityCore.org \/__/)" "\n");
34+
log(R"(https://TrinityCore.org \/__/)" "\n");
3535

3636
if (logExtraInfo)
3737
logExtraInfo();

src/server/authserver/Main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ void KeepDatabaseAliveHandler(std::weak_ptr<Trinity::Asio::DeadlineTimer> dbPing
297297
{
298298
if (std::shared_ptr<Trinity::Asio::DeadlineTimer> dbPingTimer = dbPingTimerRef.lock())
299299
{
300-
TC_LOG_INFO("server.authserver", "Ping MySQL to keep connection alive");
300+
TC_LOG_DEBUG("sql.driver", "Ping MySQL to keep connection alive");
301301
LoginDatabase.KeepAlive();
302302

303303
dbPingTimer->expires_after(std::chrono::minutes(dbPingInterval));

src/server/database/Database/DatabaseLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ DatabaseLoader& DatabaseLoader::AddDatabase(DatabaseWorkerPool<T>& pool, std::st
6868
if (error)
6969
{
7070
TC_LOG_ERROR("sql.driver", "\nDatabasePool {} NOT opened. There were errors opening the MySQL connections. Check your SQLDriverLogFile "
71-
"for specific errors. Read wiki at http://www.trinitycore.info/display/tc/TrinityCore+Home", name);
71+
"for specific errors. Read wiki at https://www.trinitycore.info", name);
7272

7373
return false;
7474
}

src/server/game/Miscellaneous/Language.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ enum TrinityStrings
10151015
LANG_CMDPARSER_SPELL_NO_EXIST = 1514,
10161016
LANG_CMDPARSER_EXACT_SEQ_MISMATCH = 1515,
10171017
LANG_CMDPARSER_CURRENCY_NO_EXIST = 1516, // master branch ONLY
1018-
LANG_CMDPARSER_QUEST_NO_EXIST = 1517, // RESERVED future cherry-pick
1018+
LANG_CMDPARSER_QUEST_NO_EXIST = 1517,
10191019

10201020
// 1516-1996 - free
10211021
LANG_DEBUG_AREATRIGGER_ENTITY_ENTERED = 1997, // master branch ONLY

src/server/game/Scripting/ScriptMgr.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -809,8 +809,8 @@ class SpecializedScriptRegistry<ScriptType, true>
809809
}
810810
else
811811
{
812-
// The script uses a script name from database, but isn't assigned to anything.
813-
TC_LOG_ERROR("sql.sql", "Script '{}' exists in the core, but the database does not assign it to any creature.",
812+
// The script exist in the core, but isn't assigned to anything in the database.
813+
TC_LOG_ERROR("sql.sql", "Script '{}' exists in the core, but is not referenced by the database!",
814814
script->GetName());
815815

816816
// Avoid calling "delete script;" because we are currently in the script constructor

src/server/game/World/World.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2557,7 +2557,7 @@ void World::Update(uint32 diff)
25572557
{
25582558
TC_METRIC_TIMER("world_update_time", TC_METRIC_TAG("type", "Ping MySQL"));
25592559
m_timers[WUPDATE_PINGDB].Reset();
2560-
TC_LOG_DEBUG("misc", "Ping MySQL to keep connection alive");
2560+
TC_LOG_DEBUG("sql.driver", "Ping MySQL to keep connection alive");
25612561
CharacterDatabase.KeepAlive();
25622562
LoginDatabase.KeepAlive();
25632563
WorldDatabase.KeepAlive();

src/server/worldserver/worldserver.conf.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ CharacterCreating.Disabled = 0
728728
#
729729
# CharacterCreating.Disabled.RaceMask
730730
# Description: Mask of races which cannot be created by players.
731-
# Example: 1536 - (1024 + 512, Blood Elf and Draenei races are disabled)
731+
# Example: 1536 - (512 + 1024, Blood Elf and Draenei races are disabled)
732732
# Default: 0 - (Enabled, All races are allowed)
733733
# 1 - (Disabled, Human)
734734
# 2 - (Disabled, Orc)

0 commit comments

Comments
 (0)