diff options
| author | Matthias Schiffer <matthias@gamezock.de> | 2009-08-31 21:21:09 +0200 |
|---|---|---|
| committer | Matthias Schiffer <matthias@gamezock.de> | 2009-08-31 21:21:09 +0200 |
| commit | 7890312d0a850ffc5be20d078d7e8f2d148dca3e (patch) | |
| tree | a466ac9d3d0a8ecde06fa5c03b154480361cfdf5 /src/Server | |
| parent | 053843f893dd5c96a88e285cf2a5b35419f7dfca (diff) | |
| download | mad-7890312d0a850ffc5be20d078d7e8f2d148dca3e.tar mad-7890312d0a850ffc5be20d078d7e8f2d148dca3e.zip | |
LogManager überarbeitet
Diffstat (limited to 'src/Server')
| -rw-r--r-- | src/Server/ConnectionManager.cpp | 4 | ||||
| -rw-r--r-- | src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp | 6 | ||||
| -rw-r--r-- | src/Server/RequestHandlers/DaemonRequestHandlerGroup.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Server/ConnectionManager.cpp b/src/Server/ConnectionManager.cpp index 4867464..ad5a7d3 100644 --- a/src/Server/ConnectionManager.cpp +++ b/src/Server/ConnectionManager.cpp @@ -134,7 +134,7 @@ bool ConnectionManager::handleConfigEntry(const Core::ConfigEntry &entry, bool h listenerAddresses.push_back(parseAddress(entry[0][0])); } catch(Core::Exception &e) { - application->logf(Core::LoggerBase::LOG_WARNING, "ConnectionManager: Invalid listen address '%s'", entry[0][0].c_str()); + application->logf(Core::Logger::LOG_WARNING, "ConnectionManager: Invalid listen address '%s'", entry[0][0].c_str()); } return true; @@ -290,7 +290,7 @@ void ConnectionManager::identifyDaemonConnection(Common::Connection *con, const if(hostInfo->getState() != Common::HostInfo::INACTIVE) { try { getDaemonConnection(name)->disconnect(); - application->log(Core::LoggerBase::LOG_WARNING, "Disconnecting old connection."); + application->log(Core::Logger::LOG_WARNING, "Disconnecting old connection."); } catch(Core::Exception&) {} } diff --git a/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp b/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp index 2171deb..af48d65 100644 --- a/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp +++ b/src/Server/RequestHandlers/ConnectionRequestHandlerGroup.cpp @@ -112,14 +112,14 @@ void ConnectionRequestHandlerGroup::handleLogRequest(boost::shared_ptr<const Com try { application->getLogManager()->log( - static_cast<Core::LoggerBase::MessageCategory>(packet->get<long>("category")), - static_cast<Core::LoggerBase::MessageLevel>(packet->get<long>("level")), + static_cast<Core::Logger::MessageCategory>(packet->get<long>("category")), + static_cast<Core::Logger::MessageLevel>(packet->get<long>("level")), timestamp, packet->get<const std::string&>("message"), application->getConnectionManager()->getDaemonName(connection)); } catch(Core::Exception &e) { - application->logf(Core::LoggerBase::LOG_ERROR, "Can't determine daemon name: %s", e.what()); + application->logf(Core::Logger::LOG_ERROR, "Can't determine daemon name: %s", e.what()); } ret->setType("OK"); diff --git a/src/Server/RequestHandlers/DaemonRequestHandlerGroup.cpp b/src/Server/RequestHandlers/DaemonRequestHandlerGroup.cpp index 35e167e..499e7b6 100644 --- a/src/Server/RequestHandlers/DaemonRequestHandlerGroup.cpp +++ b/src/Server/RequestHandlers/DaemonRequestHandlerGroup.cpp @@ -32,7 +32,7 @@ namespace RequestHandlers { void DaemonRequestHandlerGroup::DaemonRequestHandler::handlePacket(boost::shared_ptr<const Common::XmlPacket> packet) { if(packet->getType() != type) { - getApplication()->log(Core::LoggerBase::LOG_ERROR, "Received an unexpected packet."); + getApplication()->log(Core::Logger::LOG_ERROR, "Received an unexpected packet."); Common::XmlPacket ret; ret.setType("Error"); |