Merge branch 'master' of git://git.fedorahosted.org/git/crash-catcher

7 files changed, 22 insertions, 27 deletions

diff --git a/lib/MiddleWare/MiddleWare.cpp b/lib/MiddleWare/MiddleWare.cpp
index d60e645e..161b1f8e 100644
--- a/lib/MiddleWare/MiddleWare.cpp
+++ b/lib/MiddleWare/MiddleWare.cpp
@@ -183,13 +183,10 @@ void CMiddleWare::CreateReportApplication(const std::string& pApplication,
     return application->CreateReport(pDebugDumpDir);
 }
 
-#include <iostream>
-#include <stdio.h>
 void CMiddleWare::CreateReport(const std::string& pUUID,
                                const std::string& pUID,
                                crash_report_t& pCrashReport)
 {
-    std::cout << "CMiddleWare::CreateReport() s" << std::endl;
     CDatabase* database = m_pPluginManager->GetDatabase(m_sDatabase);
     database_row_t row;
     database->Connect();
@@ -219,27 +216,14 @@ void CMiddleWare::CreateReport(const std::string& pUUID,
     }
     dd.SaveText(FILENAME_UUID, UUID);
     dd.Close();
-    fflush(stdout);
-    fflush(stderr);
-    std::cerr << "CMiddleWare::CreateReport() e1" << std::endl;
-    fflush(stdout);
-    fflush(stderr);
 
     DebugDump2Report(row.m_sDebugDumpDir, pCrashReport);
-    fflush(stdout);
-    fflush(stderr);
 
-    std::cerr << "CMiddleWare::CreateReport() e2" << std::endl;
     pCrashReport.m_sMWID =  appLan + ";" + pUID + ";" + pUUID  ;
-    fflush(stdout);
-    fflush(stderr);
-
-    std::cerr << "CMiddleWare::CreateReport() e3" << std::endl;
 }
 
 void CMiddleWare::Report(const crash_report_t& pCrashReport)
 {
-    std::cout << "CMiddleWare::Report() s" << std::endl;
     std::string::size_type pos1 = 0;
     std::string::size_type pos2 = pCrashReport.m_sMWID.find(";", pos1);
     std::string lanAppPlugin = pCrashReport.m_sMWID.substr(pos1, pos2);
@@ -265,7 +249,6 @@ void CMiddleWare::Report(const crash_report_t& pCrashReport)
             reporter->Report(pCrashReport);
         }
     }
-    std::cout << "CMiddleWare::Report() e" << std::endl;
 }
 
 void CMiddleWare::DeleteDebugDump(const std::string& pUUID,
diff --git a/lib/MiddleWare/RPMInfo.cpp b/lib/MiddleWare/RPMInfo.cpp
index 64f0628a..971148b4 100644
--- a/lib/MiddleWare/RPMInfo.cpp
+++ b/lib/MiddleWare/RPMInfo.cpp
@@ -20,7 +20,7 @@ void CRPMInfo::LoadOpenGPGPublicKey(const std::string& pFileName)
     if (pgpReadPkts(pFileName.c_str(), &pkt, &pklen) != PGPARMOR_PUBKEY)
     {
         free(pkt);
-        std::cerr << "CRPMInfo::LoadOpenGPGPublicKey(): Can not load publick key " + pFileName << std::endl;
+        std::cerr << "CRPMInfo::LoadOpenGPGPublicKey(): Can not load public key " + pFileName << std::endl;
         return;
     }
     if (pgpPubkeyFingerprint(pkt, pklen, keyID) == 0)
diff --git a/lib/MiddleWare/crash-catcher.conf b/lib/MiddleWare/crash-catcher.conf
index 9421cd46..94743a1f 100644
--- a/lib/MiddleWare/crash-catcher.conf
+++ b/lib/MiddleWare/crash-catcher.conf
@@ -10,4 +10,4 @@ EnabledPlugins = SQLite3, CCpp, Mailx
 # selected DB plugin
 Database = SQLite3
 # reporters association
-CCpp = Mailx
\ No newline at end of file
+CCpp = Mailx
diff --git a/lib/Plugins/Mailx.conf b/lib/Plugins/Mailx.conf
index bfbbff89..c1bddfff 100644
--- a/lib/Plugins/Mailx.conf
+++ b/lib/Plugins/Mailx.conf
@@ -7,3 +7,6 @@ EmailFrom = user@localhost
 
 # Email To
 EmailTo = root@localhost
+
+# Warning! enabling this may cause sending a lot of MB via email
+SendBinaryData = no
diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp
index a320d3e4..0f0922f7 100644
--- a/lib/Plugins/Mailx.cpp
+++ b/lib/Plugins/Mailx.cpp
@@ -31,7 +31,8 @@ CMailx::CMailx() :
     m_sEmailFrom("user@localhost"),
     m_sEmailTo("root@localhost"),
     m_sParameters(""),
-    m_sAttachments("")
+    m_sAttachments(""),
+    m_bSendBinaryData(false)
 {}
 
 
@@ -102,13 +103,16 @@ void CMailx::Report(const crash_report_t& pReport)
     ss << "==============" << std::endl;
     ss << "See the attachment[s]" << std::endl;
 
-    if (pReport.m_sBinaryData1 != "")
+    if (m_bSendBinaryData)
     {
-        m_sAttachments = " -a " + pReport.m_sBinaryData1;
-    }
-    if (pReport.m_sBinaryData2 != "")
-    {
-        m_sAttachments = " -a " + pReport.m_sBinaryData2;
+        if (pReport.m_sBinaryData1 != "")
+        {
+            m_sAttachments = " -a " + pReport.m_sBinaryData1;
+        }
+        if (pReport.m_sBinaryData2 != "")
+        {
+            m_sAttachments = " -a " + pReport.m_sBinaryData2;
+        }
     }
 
     SendEmail(ss.str());
@@ -128,4 +132,8 @@ void CMailx::SetSettings(const map_settings_t& pSettings)
     {
         m_sParameters = pSettings.find("Parameters")->second;
     }
+    if (pSettings.find("SendBinaryData")!= pSettings.end())
+    {
+        m_bSendBinaryData = pSettings.find("SendBinaryData")->second == "yes";
+    }
 }
diff --git a/lib/Plugins/Mailx.h b/lib/Plugins/Mailx.h
index ab317eb2..1a644147 100644
--- a/lib/Plugins/Mailx.h
+++ b/lib/Plugins/Mailx.h
@@ -34,6 +34,7 @@ class CMailx : public CReporter
         std::string m_sEmailTo;
         std::string m_sParameters;
         std::string m_sAttachments;
+        bool m_bSendBinaryData;
 
         void SendEmail(const std::string& pText);
 
diff --git a/lib/Utils/DebugDump.h b/lib/Utils/DebugDump.h
index f48d8e4d..32e03967 100644
--- a/lib/Utils/DebugDump.h
+++ b/lib/Utils/DebugDump.h
@@ -34,7 +34,7 @@
 #define FILENAME_TIME               "time"
 #define FILENAME_UID                "uid"
 #define FILENAME_PACKAGE            "package"
-#define FILENAME_DESCRIPTION        "decsription"
+#define FILENAME_DESCRIPTION        "description"
 #define FILENAME_LANGUAGE           "language"
 #define FILENAME_APPLICATION        "application"
 #define FILENAME_TEXTDATA1          "text_data1"