aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/authserver/Main.cpp6
-rw-r--r--src/server/shared/Logging/Appender.h96
-rwxr-xr-xsrc/server/shared/Logging/Log.cpp6
-rwxr-xr-xsrc/server/worldserver/Main.cpp8
4 files changed, 58 insertions, 58 deletions
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 011210dd95b..90d112a1433 100755
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -86,7 +86,7 @@ extern int main(int argc, char **argv)
{
if (++c >= argc)
{
- printf("Runtime-Error: -c option requires an input argument");
+ printf("Runtime-Error: -c option requires an input argument\n");
usage(argv[0]);
return 1;
}
@@ -98,8 +98,8 @@ extern int main(int argc, char **argv)
if (!ConfigMgr::Load(cfg_file))
{
- printf("Invalid or missing configuration file : %s", cfg_file);
- printf("Verify that the file exists and has \'[authserver]\' written in the top of the file!");
+ printf("Invalid or missing configuration file : %s\n", cfg_file);
+ printf("Verify that the file exists and has \'[authserver]\' written in the top of the file!\n");
return 1;
}
diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h
index 5c4b009ef67..2d6145b14af 100644
--- a/src/server/shared/Logging/Appender.h
+++ b/src/server/shared/Logging/Appender.h
@@ -25,48 +25,48 @@
enum LogFilterType
{
- LOG_FILTER_GENERAL, // This one should only be used inside Log.cpp
- LOG_FILTER_UNITS, // Anything related to units that doesn't fit in other categories. ie. creature formations
- LOG_FILTER_PETS,
- LOG_FILTER_VEHICLES,
- LOG_FILTER_TSCR, // C++ AI, instance scripts, etc.
- LOG_FILTER_DATABASE_AI, // SmartAI, EventAI, Creature* * AI
- LOG_FILTER_MAPSCRIPTS,
- LOG_FILTER_NETWORKIO,
- LOG_FILTER_SPELLS_AURAS,
- LOG_FILTER_ACHIEVEMENTSYS,
- LOG_FILTER_CONDITIONSYS,
- LOG_FILTER_POOLSYS,
- LOG_FILTER_AUCTIONHOUSE,
- LOG_FILTER_BATTLEGROUND,
- LOG_FILTER_OUTDOORPVP,
- LOG_FILTER_CHATSYS,
- LOG_FILTER_LFG,
- LOG_FILTER_MAPS,
- LOG_FILTER_PLAYER, // Any player log that does not fit in other player filters
- LOG_FILTER_PLAYER_LOADING, // Debug output from Player::_Load functions
- LOG_FILTER_PLAYER_ITEMS,
- LOG_FILTER_PLAYER_SKILLS,
- LOG_FILTER_PLAYER_CHATLOG,
- LOG_FILTER_LOOT,
- LOG_FILTER_GUILD,
- LOG_FILTER_TRANSPORTS,
- LOG_FILTER_SQL,
- LOG_FILTER_GMCOMMAND,
- LOG_FILTER_REMOTECOMMAND,
- LOG_FILTER_WARDEN,
- LOG_FILTER_AUTHSERVER,
- LOG_FILTER_WORLDSERVER,
- LOG_FILTER_GAMEEVENTS,
- LOG_FILTER_CALENDAR,
- LOG_FILTER_CHARACTER,
- LOG_FILTER_ARENAS,
- LOG_FILTER_SQL_DRIVER,
- LOG_FILTER_SQL_DEV,
- LOG_FILTER_PLAYER_DUMP,
- LOG_FILTER_BATTLEFIELD,
- LOG_FILTER_SERVER_LOADING,
- LOG_FILTER_OPCODES
+ LOG_FILTER_GENERAL = 0, // This one should only be used inside Log.cpp
+ LOG_FILTER_UNITS = 1, // Anything related to units that doesn't fit in other categories. ie. creature formations
+ LOG_FILTER_PETS = 2,
+ LOG_FILTER_VEHICLES = 3,
+ LOG_FILTER_TSCR = 4, // C++ AI, instance scripts, etc.
+ LOG_FILTER_DATABASE_AI = 5, // SmartAI, EventAI, Creature* * AI
+ LOG_FILTER_MAPSCRIPTS = 6,
+ LOG_FILTER_NETWORKIO = 7,
+ LOG_FILTER_SPELLS_AURAS = 8,
+ LOG_FILTER_ACHIEVEMENTSYS = 9,
+ LOG_FILTER_CONDITIONSYS = 10,
+ LOG_FILTER_POOLSYS = 11,
+ LOG_FILTER_AUCTIONHOUSE = 12,
+ LOG_FILTER_BATTLEGROUND = 13,
+ LOG_FILTER_OUTDOORPVP = 14,
+ LOG_FILTER_CHATSYS = 15,
+ LOG_FILTER_LFG = 16,
+ LOG_FILTER_MAPS = 17,
+ LOG_FILTER_PLAYER = 18, // Any player log that does not fit in other player filters
+ LOG_FILTER_PLAYER_LOADING = 19, // Debug output from Player::_Load functions
+ LOG_FILTER_PLAYER_ITEMS = 20,
+ LOG_FILTER_PLAYER_SKILLS = 21,
+ LOG_FILTER_PLAYER_CHATLOG = 22,
+ LOG_FILTER_LOOT = 23,
+ LOG_FILTER_GUILD = 24,
+ LOG_FILTER_TRANSPORTS = 25,
+ LOG_FILTER_SQL = 26,
+ LOG_FILTER_GMCOMMAND = 27,
+ LOG_FILTER_REMOTECOMMAND = 28,
+ LOG_FILTER_WARDEN = 29,
+ LOG_FILTER_AUTHSERVER = 30,
+ LOG_FILTER_WORLDSERVER = 31,
+ LOG_FILTER_GAMEEVENTS = 32,
+ LOG_FILTER_CALENDAR = 33,
+ LOG_FILTER_CHARACTER = 34,
+ LOG_FILTER_ARENAS = 35,
+ LOG_FILTER_SQL_DRIVER = 36,
+ LOG_FILTER_SQL_DEV = 37,
+ LOG_FILTER_PLAYER_DUMP = 38,
+ LOG_FILTER_BATTLEFIELD = 39,
+ LOG_FILTER_SERVER_LOADING = 40,
+ LOG_FILTER_OPCODES = 41
};
const uint8 MaxLogFilter = uint8(LOG_FILTER_OPCODES) + 1;
@@ -95,12 +95,12 @@ enum AppenderType
enum AppenderFlags
{
- APPENDER_FLAGS_NONE = 0x00,
- APPENDER_FLAGS_PREFIX_TIMESTAMP = 0x01,
- APPENDER_FLAGS_PREFIX_LOGLEVEL = 0x02,
- APPENDER_FLAGS_PREFIX_LOGFILTERTYPE = 0x04,
- APPENDER_FLAGS_USE_TIMESTAMP = 0x08, // only used by FileAppender
- APPENDER_FLAGS_MAKE_FILE_BACKUP = 0x10 // only used by FileAppender
+ APPENDER_FLAGS_NONE = 0x00,
+ APPENDER_FLAGS_PREFIX_TIMESTAMP = 0x01,
+ APPENDER_FLAGS_PREFIX_LOGLEVEL = 0x02,
+ APPENDER_FLAGS_PREFIX_LOGFILTERTYPE = 0x04,
+ APPENDER_FLAGS_USE_TIMESTAMP = 0x08, // only used by FileAppender
+ APPENDER_FLAGS_MAKE_FILE_BACKUP = 0x10 // only used by FileAppender
};
struct LogMessage
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 4538fc75c1e..d8914ac8ee0 100755
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -435,10 +435,10 @@ void Log::outCharDump(char const* str, uint32 accountId, uint32 guid, char const
<< ")\n" << str << "\n== END DUMP ==\n";
LogMessage* msg = new LogMessage(LOG_LEVEL_INFO, LOG_FILTER_PLAYER_DUMP, ss.str());
- ss.clear();
- ss << guid << '_' << name;
+ std::ostringstream param;
+ param << guid << '_' << name;
- msg->param1 = ss.str();
+ msg->param1 = param.str();
write(msg);
}
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 7e43cf87dfc..16fbca2597d 100755
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -104,13 +104,13 @@ extern int main(int argc, char **argv)
if (strcmp(argv[c], "install") == 0)
{
if (WinServiceInstall())
- printf("Installing service");
+ printf("Installing service\n");
return 1;
}
else if (strcmp(argv[c], "uninstall") == 0)
{
if (WinServiceUninstall())
- printf("Uninstalling service");
+ printf("Uninstalling service\n");
return 1;
}
else
@@ -131,8 +131,8 @@ extern int main(int argc, char **argv)
if (!ConfigMgr::Load(cfg_file))
{
- printf("Invalid or missing configuration file : %s", cfg_file);
- printf("Verify that the file exists and has \'[worldserver]' written in the top of the file!");
+ printf("Invalid or missing configuration file : %s\n", cfg_file);
+ printf("Verify that the file exists and has \'[worldserver]' written in the top of the file!\n");
return 1;
}
sLog->outInfo(LOG_FILTER_WORLDSERVER, "Using configuration file %s.", cfg_file);