diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-19 13:55:23 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-19 13:55:23 +0100 |
commit | b348085ac9f3d4a7ded81026bffa962a065bdf97 (patch) | |
tree | db5fda2df01df4ed7bed0e17f12bf3e5dfd2cbc6 | |
parent | 6edf29e32c72e2d860019b2b987012fe52ac49a0 (diff) | |
download | abrt-b348085ac9f3d4a7ded81026bffa962a065bdf97.tar.gz abrt-b348085ac9f3d4a7ded81026bffa962a065bdf97.tar.xz abrt-b348085ac9f3d4a7ded81026bffa962a065bdf97.zip |
Eliminate ATT file type - use TXT or BIN
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | inc/CrashTypes.h | 11 | ||||
-rw-r--r-- | lib/Plugins/Bugzilla.cpp | 2 | ||||
-rw-r--r-- | lib/Plugins/Catcut.cpp | 6 | ||||
-rw-r--r-- | lib/Plugins/Logger.conf | 4 | ||||
-rw-r--r-- | lib/Plugins/Logger.cpp | 2 | ||||
-rw-r--r-- | lib/Plugins/Mailx.cpp | 12 | ||||
-rw-r--r-- | lib/Plugins/TicketUploader.cpp | 5 | ||||
-rw-r--r-- | lib/Utils/make_descr.cpp | 68 | ||||
-rw-r--r-- | src/Daemon/CommLayerServerDBus.cpp | 9 | ||||
-rw-r--r-- | src/Daemon/MiddleWare.cpp | 4 | ||||
-rw-r--r-- | src/Gui/CCReporterDialog.py | 3 | ||||
-rw-r--r-- | src/Gui/CC_gui_functions.py | 2 |
12 files changed, 54 insertions, 74 deletions
diff --git a/inc/CrashTypes.h b/inc/CrashTypes.h index 77947f6f..ccbdd929 100644 --- a/inc/CrashTypes.h +++ b/inc/CrashTypes.h @@ -4,17 +4,14 @@ #include "abrt_types.h" // SYS - system value, should not be displayed -// BIN - binary value, should be displayed as a path to binary file -// TXT - text value, should be displayed -// ATT - text value which can be sent as attachment via reporters -// TODO: maybe we don't need separate CD_ATT - can simply look at strlen(content) -// in all places which want to handle "long" and "short" texts differently +// BIN - binary data +// TXT - text data, can be displayed #define CD_SYS "s" #define CD_BIN "b" #define CD_TXT "t" -#define CD_ATT "a" -#define CD_ATT_SIZE (256) +/* Text bigger than this usually is attached, not added inline */ +#define CD_TEXT_ATT_SIZE (2*1024) #define CD_ISEDITABLE "y" #define CD_ISNOTEDITABLE "n" diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp index 6f0f8d7b..f963eb9c 100644 --- a/lib/Plugins/Bugzilla.cpp +++ b/lib/Plugins/Bugzilla.cpp @@ -360,7 +360,7 @@ void ctx::add_attachments(const char* bug_id_str, const map_crash_report_t& pCra const std::string &type = it->second[CD_TYPE]; const std::string &content = it->second[CD_CONTENT]; - if (type == CD_ATT) + if (type == CD_TXT && content.length() > CD_TEXT_ATT_SIZE) { char *encoded64 = encode_base64(content.c_str(), content.length()); // fails only when you write query. when it's done it never fails. diff --git a/lib/Plugins/Catcut.cpp b/lib/Plugins/Catcut.cpp index 27b868dc..b69038fb 100644 --- a/lib/Plugins/Catcut.cpp +++ b/lib/Plugins/Catcut.cpp @@ -390,9 +390,9 @@ ctx::add_attachments(const char* xmlrpc_URL, map_crash_report_t::const_iterator it = pCrashReport.begin(); for (; it != pCrashReport.end(); it++) { - if (it->second[CD_TYPE] == CD_ATT) + if (it->second[CD_TYPE] == CD_TXT && it->second[CD_TYPE].size() > CD_TEXT_ATT_SIZE) { - update_client(_("Attaching (CD_ATT): %s"), it->first.c_str()); + update_client(_("Attaching (text): %s"), it->first.c_str()); string description = "File: " + it->first; string URL = request_upload(auth_cookie, @@ -410,7 +410,7 @@ ctx::add_attachments(const char* xmlrpc_URL, } else if (it->second[CD_TYPE] == CD_BIN) { - update_client(_("Attaching (CD_ATT): %s"), it->first.c_str()); + update_client(_("Attaching binary: %s"), it->first.c_str()); string description = "File: " + it->first; string URL = request_upload(auth_cookie, diff --git a/lib/Plugins/Logger.conf b/lib/Plugins/Logger.conf index 39ba47e1..8809963c 100644 --- a/lib/Plugins/Logger.conf +++ b/lib/Plugins/Logger.conf @@ -1,6 +1,6 @@ # Configuration for Logger plugin -LogPath = /var/log/abrt-logger +LogPath = /var/log/abrt.log AppendLogs = yes -Enabled = yes
\ No newline at end of file +Enabled = yes diff --git a/lib/Plugins/Logger.cpp b/lib/Plugins/Logger.cpp index a0dea424..d6cc124e 100644 --- a/lib/Plugins/Logger.cpp +++ b/lib/Plugins/Logger.cpp @@ -28,7 +28,7 @@ #include "ABRTException.h" CLogger::CLogger() : - m_sLogPath("/var/log/abrt-logger"), + m_sLogPath("/var/log/abrt.log"), m_bAppendLogs(true) {} diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp index df33e84c..2f8448f5 100644 --- a/lib/Plugins/Mailx.cpp +++ b/lib/Plugins/Mailx.cpp @@ -74,7 +74,7 @@ std::string CMailx::Report(const map_crash_report_t& pCrashReport, args = append_str_to_vector(args, arg_size, MAILX_COMMAND); //TODO: move email body generation to make_descr.cpp - std::string binaryFiles, commonFiles, bigTextFiles, additionalFiles, UUIDFile; + std::string binaryFiles, commonFiles, additionalFiles, UUIDFile; map_crash_report_t::const_iterator it; for (it = pCrashReport.begin(); it != pCrashReport.end(); it++) { @@ -105,13 +105,6 @@ std::string CMailx::Report(const map_crash_report_t& pCrashReport, commonFiles += "\n\n"; } } - if (it->second[CD_TYPE] == CD_ATT) - { - bigTextFiles += it->first; - bigTextFiles += "\n-----\n"; - bigTextFiles += it->second[CD_CONTENT]; - bigTextFiles += "\n\n"; - } if (it->second[CD_TYPE] == CD_BIN) { binaryFiles += " -a "; @@ -133,9 +126,6 @@ std::string CMailx::Report(const map_crash_report_t& pCrashReport, emailBody += "\nAdditional information\n"; emailBody += "=====\n\n"; emailBody += additionalFiles; - emailBody += "\nOther information\n"; - emailBody += "=====\n\n"; - emailBody += bigTextFiles; emailBody += '\n'; args = append_str_to_vector(args, arg_size, "-s"); diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp index 608ee40b..7483768d 100644 --- a/lib/Plugins/TicketUploader.cpp +++ b/lib/Plugins/TicketUploader.cpp @@ -203,9 +203,8 @@ string CTicketUploader::Report(const map_crash_report_t& pCrashReport, map_crash_report_t::const_iterator it; for (it = pCrashReport.begin(); it != pCrashReport.end(); it++) { - if (it->second[CD_TYPE] == CD_TXT - || it->second[CD_TYPE] == CD_ATT - ) { + if (it->second[CD_TYPE] == CD_TXT) + { string ofile_name = concat_path_file(tmptar_name.c_str(), it->first.c_str()); ofstream ofile(ofile_name.c_str(), fstream::trunc|fstream::binary); if (!ofile) diff --git a/lib/Utils/make_descr.cpp b/lib/Utils/make_descr.cpp index 90bd76a9..2a0d4a99 100644 --- a/lib/Utils/make_descr.cpp +++ b/lib/Utils/make_descr.cpp @@ -50,9 +50,6 @@ static void add_content(bool &was_multiline, string& description, const char *he } } -/* Text attachments smaller than this will be also included in descrition */ -#define INLINE_TEXT_ATT_SIZE (2*1024) - string make_description_bz(const map_crash_report_t& pCrashReport) { string description; @@ -79,22 +76,21 @@ string make_description_bz(const map_crash_report_t& pCrashReport) const string &filename = it->first; const string &type = it->second[CD_TYPE]; const string &content = it->second[CD_CONTENT]; - if (type == CD_TXT - || (type == CD_ATT && content.size() < INLINE_TEXT_ATT_SIZE) - ) { - if (filename != CD_UUID - && filename != FILENAME_ARCHITECTURE - && filename != FILENAME_RELEASE - && filename != CD_REPRODUCE - && filename != CD_COMMENT - ) { - add_content(was_multiline, description, filename.c_str(), content.c_str()); - } - continue; - } - if (type == CD_ATT) + if (type == CD_TXT) { - add_content(was_multiline, description, "Attached file", filename.c_str()); + if (content.size() <= CD_TEXT_ATT_SIZE) + { + if (filename != CD_UUID + && filename != FILENAME_ARCHITECTURE + && filename != FILENAME_RELEASE + && filename != CD_REPRODUCE + && filename != CD_COMMENT + ) { + add_content(was_multiline, description, filename.c_str(), content.c_str()); + } + } else { + add_content(was_multiline, description, "Attached file", filename.c_str()); + } } } @@ -113,7 +109,6 @@ string make_description_logger(const map_crash_report_t& pCrashReport) const string &type = it->second[CD_TYPE]; const string &content = it->second[CD_CONTENT]; if (type == CD_TXT - || type == CD_ATT || type == CD_BIN ) { if (content == "1.\n2.\n3.\n") @@ -181,26 +176,27 @@ string make_description_catcut(const map_crash_report_t& pCrashReport) const string &content = it->second[CD_CONTENT]; if (type == CD_TXT) { - if (filename != CD_UUID - && filename != FILENAME_ARCHITECTURE - && filename != FILENAME_RELEASE - && filename != CD_REPRODUCE - && filename != CD_COMMENT - ) { - pDescription += '\n'; + if (content.length() <= CD_TEXT_ATT_SIZE) + { + if (filename != CD_UUID + && filename != FILENAME_ARCHITECTURE + && filename != FILENAME_RELEASE + && filename != CD_REPRODUCE + && filename != CD_COMMENT + ) { + pDescription += '\n'; + pDescription += filename; + pDescription += "\n-----\n"; + pDescription += content; + pDescription += "\n\n"; + } + } else { + pDescription += "\n\nAttached files\n" + "----\n"; pDescription += filename; - pDescription += "\n-----\n"; - pDescription += content; - pDescription += "\n\n"; + pDescription += '\n'; } } - else if (type == CD_ATT) - { - pDescription += "\n\nAttached files\n" - "----\n"; - pDescription += filename; - pDescription += '\n'; - } else if (type == CD_BIN) { error_msg(_("Binary file %s will not be reported"), filename.c_str()); diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp index db0d2f55..182aa6c2 100644 --- a/src/Daemon/CommLayerServerDBus.cpp +++ b/src/Daemon/CommLayerServerDBus.cpp @@ -205,10 +205,8 @@ static int handle_Report(DBusMessage* call, DBusMessage* reply) int r; DBusMessageIter in_iter; dbus_message_iter_init(call, &in_iter); - map_crash_report_t argin1; - const char* comment; - const char* reproduce; + map_crash_report_t argin1; r = load_val(&in_iter, argin1); if (r == ABRT_DBUS_ERROR) { @@ -218,9 +216,8 @@ static int handle_Report(DBusMessage* call, DBusMessage* reply) map_crash_report_t::const_iterator it_comment = argin1.find(CD_COMMENT); map_crash_report_t::const_iterator it_reproduce = argin1.find(CD_REPRODUCE); - comment = (it_comment != argin1.end()) ? it_comment->second[CD_CONTENT].c_str() : ""; - reproduce = (it_reproduce != argin1.end()) ? it_reproduce->second[CD_CONTENT].c_str() : ""; - + const char* comment = (it_comment != argin1.end()) ? it_comment->second[CD_CONTENT].c_str() : ""; + const char* reproduce = (it_reproduce != argin1.end()) ? it_reproduce->second[CD_CONTENT].c_str() : ""; const char* errmsg = NULL; if (strlen(comment) > LIMIT_MESSAGE) { diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index 70527ebe..c2a122a7 100644 --- a/src/Daemon/MiddleWare.cpp +++ b/src/Daemon/MiddleWare.cpp @@ -187,7 +187,7 @@ static void DebugDumpToCrashReport(const char *pDebugDumpDir, map_crash_report_t add_crash_data_to_crash_report( pCrashReport, short_name, - (content.length() < CD_ATT_SIZE ? CD_TXT : CD_ATT), + CD_TXT, CD_ISEDITABLE, content ); @@ -433,6 +433,8 @@ report_status_t Report(const map_crash_report_t& pCrashReport, { report_status_t ret; + /* dbus handler passes pCrashReport from user without checking it */ + if (!CheckReport(pCrashReport)) { throw CABRTException(EXCEP_ERROR, "Report(): Some of mandatory report data are missing."); diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py index 9bc5ff59..ea4b046a 100644 --- a/src/Gui/CCReporterDialog.py +++ b/src/Gui/CCReporterDialog.py @@ -21,7 +21,6 @@ CD_CONTENT = 2 CD_SYS = "s" CD_BIN = "b" CD_TXT = "t" -CD_ATT = "a" # response REFRESH = -50 @@ -256,7 +255,7 @@ class ReporterDialog(): self.editable.append(item) self.row_dict[item] = self.reportListStore.append([item, self.report[item][CD_CONTENT], item in self.editable, True, - self.report[item][CD_TYPE] in [CD_ATT,CD_BIN]]) + self.report[item][CD_TYPE] == CD_BIN]) def dehydrate(self): attributes = ["item", "content", "editable", "send", "attachment"] diff --git a/src/Gui/CC_gui_functions.py b/src/Gui/CC_gui_functions.py index 0379f205..a9c47faf 100644 --- a/src/Gui/CC_gui_functions.py +++ b/src/Gui/CC_gui_functions.py @@ -234,5 +234,5 @@ def show_log(log, parent=None): if __name__ == "__main__": window = gtk.Window() - gui_report_dialog("<b>Bugzilla</b>: <span foreground='red'>CReporterBugzilla::Report(): CReporterBugzilla::Login(): RPC response indicates failure. The username or password you entered is not valid.</span>\n<b>Logger</b>: Report was stored into: /var/log/abrt-logger", window) + gui_report_dialog("<b>Bugzilla</b>: <span foreground='red'>CReporterBugzilla::Report(): CReporterBugzilla::Login(): RPC response indicates failure. The username or password you entered is not valid.</span>\n<b>Logger</b>: Report was stored into: /var/log/abrt.log", window) gtk.main() |