diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-05-20 11:18:34 +0200 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-05-20 11:18:34 +0200 |
| commit | 40d3a846c8fb7dcbc03cf2dfcd911baf0b64987b (patch) | |
| tree | e82b6f14b4d8073cd0e52253747beaaa7e509439 | |
| parent | 407222babd840bcc935789dc441f6099f9d22412 (diff) | |
| parent | bc12d93a46c87ccf647f83b4eafd4378d19b9e29 (diff) | |
| download | abrt-40d3a846c8fb7dcbc03cf2dfcd911baf0b64987b.tar.gz abrt-40d3a846c8fb7dcbc03cf2dfcd911baf0b64987b.tar.xz abrt-40d3a846c8fb7dcbc03cf2dfcd911baf0b64987b.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
| -rw-r--r-- | lib/Plugins/Bugzilla.cpp | 2 | ||||
| -rw-r--r-- | lib/Plugins/CCpp.cpp | 2 | ||||
| -rw-r--r-- | lib/Plugins/Mailx.cpp | 8 | ||||
| -rw-r--r-- | src/Daemon/Daemon.cpp | 5 |
4 files changed, 13 insertions, 4 deletions
diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp index 8ad28cf..80cbec4 100644 --- a/lib/Plugins/Bugzilla.cpp +++ b/lib/Plugins/Bugzilla.cpp @@ -246,7 +246,7 @@ void CReporterBugzilla::AddAttachments(const std::string& pBugId, const map_cras try { rpc->call(m_pXmlrpcClient, m_pCarriageParm); - ret = xmlrpc_c::value_array(rpc->getResult()).vectorValueValue(); + ret = xmlrpc_c::value_array(rpc->getResult()).vectorValueValue(); std::stringstream ss; ss << xmlrpc_c::value_int(ret[0]); comm_layer_inner_debug("New attachment id: " + ss.str()); diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index 2561842..cce3fb4 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -217,7 +217,7 @@ void CAnalyzerCCpp::GetBacktrace(const std::string& pDebugDumpDir, std::string& dd.Close(); fTmp << "file " << executable << std::endl; fTmp << "core " << pDebugDumpDir << "/" << FILENAME_COREDUMP << std::endl; - fTmp << "bt full" << std::endl; + fTmp << "thread apply all backtrace full" << std::endl; fTmp << "q" << std::endl; fTmp.close(); } diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp index 6e596f2..d4b44cf 100644 --- a/lib/Plugins/Mailx.cpp +++ b/lib/Plugins/Mailx.cpp @@ -98,7 +98,9 @@ void CMailx::Report(const map_crash_report_t& pCrashReport, const std::string& p } if (it->second[CD_TYPE] == CD_ATT) { - bigTextFiles << " -a " << it->second[CD_CONTENT]; + bigTextFiles << it->first << std::endl; + bigTextFiles << "-----" << std::endl; + bigTextFiles << it->second[CD_CONTENT] << std::endl << std::endl; } if (it->second[CD_TYPE] == CD_BIN) { @@ -117,7 +119,9 @@ void CMailx::Report(const map_crash_report_t& pCrashReport, const std::string& p emailBody << "Additional information" << std::endl; emailBody << "=====" << std::endl << std::endl; emailBody << additionalFiles.str() << std::endl; - m_sAttachments = bigTextFiles.str(); + emailBody << "Other information" << std::endl; + emailBody << "=====" << std::endl << std::endl; + emailBody << bigTextFiles << std::endl; if (m_bSendBinaryData) { diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index f8d01de..a404e80 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -18,6 +18,7 @@ */ #include "CrashWatcher.h" +#include "ABRTException.h" #include <iostream> #include <cstdio> @@ -61,6 +62,10 @@ int main(int argc, char** argv) g_pCrashWatcher->Run(); } } + catch(CABRTException& e) + { + std::cerr << "Cannot create daemon: " << e.what() << std::endl; + } catch(std::exception& e) { std::cerr << "Cannot create daemon: " << e.what() << std::endl; |