From 1202706839ec42299e8794750cec66dfa7db0206 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 6 Nov 2009 17:51:17 +0100 Subject: simplify logging a bit. warn_client() is gone, reuse error_msg() for it. Signed-off-by: Denys Vlasenko --- lib/Plugins/TicketUploader.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'lib/Plugins/TicketUploader.cpp') diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp index 4aa05b7..60cba31 100644 --- a/lib/Plugins/TicketUploader.cpp +++ b/lib/Plugins/TicketUploader.cpp @@ -43,7 +43,7 @@ CTicketUploader::~CTicketUploader() static void Error(const char *msg) { - update_client(msg); + update_client("%s", msg); throw CABRTException(EXCEP_PLUGIN, msg); } @@ -102,11 +102,11 @@ void CTicketUploader::SendFile(const char *pURL, const char *pFilename) { if (pURL[0] == '\0') { - warn_client(_("FileTransfer: URL not specified")); + error_msg(_("FileTransfer: URL not specified")); return; } - update_client(ssprintf(_("Sending archive %s to %s"), pFilename, pURL)); + update_client(_("Sending archive %s to %s"), pFilename, pURL); const char *base = (strrchr(pFilename, '/') ? : pFilename-1) + 1; string wholeURL = concat_path_file(pURL, base); @@ -133,7 +133,6 @@ void CTicketUploader::SendFile(const char *pURL, const char *pFilename) curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L); /* specify target */ curl_easy_setopt(curl, CURLOPT_URL, wholeURL.c_str()); - /*file handle: passed to the default callback, it will fread() it*/ curl_easy_setopt(curl, CURLOPT_READDATA, f); curl_easy_setopt(curl, CURLOPT_INFILESIZE, buf.st_size); /* everything is done here; result 0 means success */ @@ -143,7 +142,7 @@ void CTicketUploader::SendFile(const char *pURL, const char *pFilename) fclose(f); if (result != 0) { - update_client(ssprintf(_("Sending failed, trying again. %s"), curl_easy_strerror((CURLcode)result))); + update_client(_("Sending failed, trying again. %s"), curl_easy_strerror((CURLcode)result)); } } /*retry the upload if not succesful, wait a bit before next try*/ @@ -317,19 +316,19 @@ string CTicketUploader::Report(const map_crash_report_t& pCrashReport, } msgbuf << _("END: ") << endl; - warn_client(msgbuf.str()); + error_msg("%s", msgbuf.str()); string ret; if (do_upload) { string xx = _("report sent to ") + upload_url + '/' + outfile_basename; - update_client(xx); + update_client("%s", xx); ret = xx; } else { string xx = _("report copied to /tmp/") + outfile_basename; - update_client(xx); + update_client("%s", xx); ret = xx; } -- cgit From 152e24176d55e1f9320de05bdd80de74e6973d95 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 6 Nov 2009 18:25:57 +0100 Subject: fix fallount from string types shuffling Signed-off-by: Denys Vlasenko --- lib/Plugins/TicketUploader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/Plugins/TicketUploader.cpp') diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp index 60cba31..d0ed324 100644 --- a/lib/Plugins/TicketUploader.cpp +++ b/lib/Plugins/TicketUploader.cpp @@ -316,19 +316,19 @@ string CTicketUploader::Report(const map_crash_report_t& pCrashReport, } msgbuf << _("END: ") << endl; - error_msg("%s", msgbuf.str()); + error_msg("%s", msgbuf.str().c_str()); string ret; if (do_upload) { string xx = _("report sent to ") + upload_url + '/' + outfile_basename; - update_client("%s", xx); + update_client("%s", xx.c_str()); ret = xx; } else { string xx = _("report copied to /tmp/") + outfile_basename; - update_client("%s", xx); + update_client("%s", xx.c_str()); ret = xx; } -- cgit From 57039b590e4411606795893c90f9871e0412ca31 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 6 Nov 2009 18:26:42 +0100 Subject: give Plugin class a map_plugin_settings_t member This simplifies and unifies get/set settings ops Signed-off-by: Denys Vlasenko --- lib/Plugins/TicketUploader.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'lib/Plugins/TicketUploader.cpp') diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp index d0ed324..e380de0 100644 --- a/lib/Plugins/TicketUploader.cpp +++ b/lib/Plugins/TicketUploader.cpp @@ -381,20 +381,17 @@ void CTicketUploader::SetSettings(const map_plugin_settings_t& pSettings) } } -map_plugin_settings_t CTicketUploader::GetSettings() +const map_plugin_settings_t& CTicketUploader::GetSettings() { - map_plugin_settings_t ret; - - ret["Customer"] = m_sCustomer; - ret["Ticket"] = m_sTicket; - ret["URL"] = m_sURL; - ret["Encrypt"] = m_bEncrypt ? "yes" : "no"; - ret["Upload"] = m_bEncrypt ? "yes" : "no"; - - ret["RetryCount"] = to_string(m_nRetryCount); - ret["RetryDelay"] = to_string(m_nRetryDelay); - - return ret; + m_pSettings["Customer"] = m_sCustomer; + m_pSettings["Ticket"] = m_sTicket; + m_pSettings["URL"] = m_sURL; + m_pSettings["Encrypt"] = m_bEncrypt ? "yes" : "no"; + m_pSettings["Upload"] = m_bEncrypt ? "yes" : "no"; + m_pSettings["RetryCount"] = to_string(m_nRetryCount); + m_pSettings["RetryDelay"] = to_string(m_nRetryDelay); + + return m_pSettings; } PLUGIN_INFO(REPORTER, -- cgit