diff options
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/Database/Implementation/CharacterDatabase.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Logging/Appender.h | 96 | ||||
| -rwxr-xr-x | src/server/shared/Logging/Log.cpp | 6 |
3 files changed, 53 insertions, 53 deletions
diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index c29d8313c20..d9b517c098f 100644 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -327,8 +327,8 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_DEL_GO_RESPAWN_BY_INSTANCE, "DELETE FROM gameobject_respawn WHERE mapId = ? AND instanceId = ?", CONNECTION_ASYNC) // GM Tickets - PREPARE_STATEMENT(CHAR_SEL_GM_TICKETS, "SELECT ticketId, guid, name, message, createTime, mapId, posX, posY, posZ, lastModifiedTime, closedBy, assignedTo, comment, completed, escalated, viewed FROM gm_tickets", CONNECTION_SYNCH) - PREPARE_STATEMENT(CHAR_REP_GM_TICKET, "REPLACE INTO gm_tickets (ticketId, guid, name, message, createTime, mapId, posX, posY, posZ, lastModifiedTime, closedBy, assignedTo, comment, completed, escalated, viewed) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_SEL_GM_TICKETS, "SELECT ticketId, guid, name, message, createTime, mapId, posX, posY, posZ, lastModifiedTime, closedBy, assignedTo, comment, response, completed, escalated, viewed, haveTicket FROM gm_tickets", CONNECTION_SYNCH) + PREPARE_STATEMENT(CHAR_REP_GM_TICKET, "REPLACE INTO gm_tickets (ticketId, guid, name, message, createTime, mapId, posX, posY, posZ, lastModifiedTime, closedBy, assignedTo, comment, response, completed, escalated, viewed, haveTicket) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_DEL_GM_TICKET, "DELETE FROM gm_tickets WHERE ticketId = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_DEL_PLAYER_GM_TICKETS, "DELETE FROM gm_tickets WHERE guid = ?", CONNECTION_ASYNC) 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); } |