aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Logging
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/shared/Logging')
-rw-r--r--src/server/shared/Logging/AppenderDB.cpp8
-rw-r--r--src/server/shared/Logging/AppenderDB.h4
-rw-r--r--src/server/shared/Logging/Log.cpp6
3 files changed, 9 insertions, 9 deletions
diff --git a/src/server/shared/Logging/AppenderDB.cpp b/src/server/shared/Logging/AppenderDB.cpp
index d85a4db9f7a..e9feef0e858 100644
--- a/src/server/shared/Logging/AppenderDB.cpp
+++ b/src/server/shared/Logging/AppenderDB.cpp
@@ -18,8 +18,8 @@
#include "AppenderDB.h"
#include "Database/DatabaseEnv.h"
-AppenderDB::AppenderDB(uint8 id, std::string const& name, LogLevel level, uint8 realmId):
-Appender(id, name, APPENDER_DB, level), realm(realmId), enable(false)
+AppenderDB::AppenderDB(uint8 id, std::string const& name, LogLevel level, uint32 realmId)
+ : Appender(id, name, APPENDER_DB, level), realm(realmId), enable(false)
{
}
@@ -41,8 +41,8 @@ void AppenderDB::_write(LogMessage& message)
PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_LOG);
stmt->setUInt64(0, message.mtime);
stmt->setUInt32(1, realm);
- stmt->setUInt8(2, message.type);
- stmt->setUInt8(3, message.level);
+ stmt->setUInt8(2, uint8(message.type));
+ stmt->setUInt8(3, uint8(message.level));
stmt->setString(4, message.text);
LoginDatabase.Execute(stmt);
break;
diff --git a/src/server/shared/Logging/AppenderDB.h b/src/server/shared/Logging/AppenderDB.h
index 4399195b181..f1b680c2c5e 100644
--- a/src/server/shared/Logging/AppenderDB.h
+++ b/src/server/shared/Logging/AppenderDB.h
@@ -23,12 +23,12 @@
class AppenderDB: public Appender
{
public:
- AppenderDB(uint8 _id, std::string const& _name, LogLevel level, uint8 realmId);
+ AppenderDB(uint8 _id, std::string const& _name, LogLevel level, uint32 realmId);
~AppenderDB();
void setEnable(bool enable);
private:
- uint8 realm;
+ uint32 realm;
bool enable;
void _write(LogMessage& message);
};
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index d8914ac8ee0..c2aef9ac125 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -169,7 +169,7 @@ void Log::CreateLoggerFromConfig(const char* name)
return;
LogLevel level = LOG_LEVEL_DISABLED;
- int32 type = -1;
+ uint8 type = uint8(-1);
std::string options = "Logger.";
options.append(name);
@@ -190,7 +190,7 @@ void Log::CreateLoggerFromConfig(const char* name)
return;
}
- type = atoi(*iter);
+ type = uint8(atoi(*iter));
if (type > MaxLogFilter)
{
fprintf(stderr, "Log::CreateLoggerFromConfig: Wrong type %u for logger %s\n", type, name);
@@ -334,7 +334,7 @@ bool Log::SetLogLevel(std::string const& name, const char* newLevelc, bool isLog
bool Log::ShouldLog(LogFilterType type, LogLevel level) const
{
- LoggerMap::const_iterator it = loggers.find(type);
+ LoggerMap::const_iterator it = loggers.find(uint8(type));
if (it != loggers.end())
{
LogLevel loggerLevel = it->second.getLogLevel();