tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove icinga::ErrorInformation. 

Fixes #6333
This commit is contained in:
Gunnar Beutner 2014-05-27 15:51:38 +02:00
parent ecb4f9738e
commit e7c09dac97
4 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/db_ido_mysql/idomysqlconnection.cpp
View File

@ -94,8 +94,7 @@ void IdoMysqlConnection::Pause(void)
void IdoMysqlConnection::ExceptionHandler(boost::exception_ptr exp)
{
Log(LogCritical, "db_ido_mysql", "Exception during database operation: '" + ErrorInformation(exp) + "'");
Log(LogDebug, "db_ido_mysql", "Exception during database operation: " + DiagnosticInformation(exp));
Log(LogWarning, "db_ido_mysql", "Exception during database operation: " + DiagnosticInformation(exp));
boost::mutex::scoped_lock lock(m_ConnectionMutex);

3
components/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -96,8 +96,7 @@ void IdoPgsqlConnection::Pause(void)
void IdoPgsqlConnection::ExceptionHandler(boost::exception_ptr exp)
{
Log(LogCritical, "db_ido_pgsql", "Exception during database operation: '" + ErrorInformation(exp) + "'");
Log(LogDebug, "db_ido_pgsql", "Exception during database operation: " + DiagnosticInformation(exp));
Log(LogWarning, "db_ido_pgsql", "Exception during database operation: " + DiagnosticInformation(exp));
boost::mutex::scoped_lock lock(m_ConnectionMutex);

8
lib/base/exception.cpp
View File

@ -153,11 +153,3 @@ String icinga::DiagnosticInformation(boost::exception_ptr eptr)
return boost::diagnostic_information(eptr);
}
String icinga::ErrorInformation(boost::exception_ptr eptr)
{
try {
boost::rethrow_exception(eptr);
} catch (const std::exception& ex) {
return ex.what();
}
}

11
lib/base/exception.hpp
View File

@ -84,18 +84,7 @@ String DiagnosticInformation(const T& ex, StackTrace *stack = NULL, ContextTrace
return result.str();
}
template<typename T>
String ErrorInformation(const T& ex)
{
std::ostringstream result;
result << ex.what();
return result.str();
}
I2_BASE_API String DiagnosticInformation(boost::exception_ptr eptr);
I2_BASE_API String ErrorInformation(boost::exception_ptr eptr);
class I2_BASE_API posix_error : virtual public std::exception, virtual public boost::exception { };