From e43c8c787e7b3eb189e3dab8f8ca11958b23e054 Mon Sep 17 00:00:00 2001 From: Zdenek Prikryl Date: Wed, 18 Feb 2009 17:22:30 +0100 Subject: changed configuration --- lib/Plugins/Logger.conf | 4 ++-- lib/Plugins/Logger.cpp | 29 +++++++++++++++++++++++++---- lib/Plugins/Logger.h | 22 ++++++++++++++++++++++ lib/Plugins/Mailx.conf | 4 ++-- lib/Plugins/Mailx.cpp | 8 ++++---- 5 files changed, 55 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/Plugins/Logger.conf b/lib/Plugins/Logger.conf index 8cd09503..b720b3b7 100644 --- a/lib/Plugins/Logger.conf +++ b/lib/Plugins/Logger.conf @@ -1,5 +1,5 @@ # Configuration for Logger plugin -Log_Path = /tmp/CCLogger +LogPath = /tmp/CCLogger -Append_Logs = yes \ No newline at end of file +AppendLogs = yes \ No newline at end of file diff --git a/lib/Plugins/Logger.cpp b/lib/Plugins/Logger.cpp index 0af8f078..68734df4 100644 --- a/lib/Plugins/Logger.cpp +++ b/lib/Plugins/Logger.cpp @@ -1,3 +1,24 @@ +/* + Logger.cpp - it simple writes report to specific file + + Copyright (C) 2009 Zdenek Prikryl (zprikryl@redhat.com) + Copyright (C) 2009 RedHat inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include "Logger.h" #include @@ -8,13 +29,13 @@ CLogger::CLogger() : void CLogger::SetSettings(const map_settings_t& pSettings) { - if (pSettings.find("Log_Path")!= pSettings.end()) + if (pSettings.find("LogPath")!= pSettings.end()) { - m_sLogPath = pSettings.find("Log_Path")->second; + m_sLogPath = pSettings.find("LogPath")->second; } - if (pSettings.find("Append_Logs")!= pSettings.end()) + if (pSettings.find("AppendLogs")!= pSettings.end()) { - m_bAppendLogs = pSettings.find("Append_Logs")->second == "yes"; + m_bAppendLogs = pSettings.find("AppendLogs")->second == "yes"; } } diff --git a/lib/Plugins/Logger.h b/lib/Plugins/Logger.h index 509d2ab2..9a4e304f 100644 --- a/lib/Plugins/Logger.h +++ b/lib/Plugins/Logger.h @@ -1,3 +1,25 @@ +/* + Logger.h - header file for Logger reporter plugin + - it simple writes report to specific file + + Copyright (C) 2009 Zdenek Prikryl (zprikryl@redhat.com) + Copyright (C) 2009 RedHat inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef LOGGER_H_ #define LOGGER_H_ diff --git a/lib/Plugins/Mailx.conf b/lib/Plugins/Mailx.conf index 0ba7bcc0..bfbbff89 100644 --- a/lib/Plugins/Mailx.conf +++ b/lib/Plugins/Mailx.conf @@ -3,7 +3,7 @@ Parameters = # Your Email -Email_From = user@localhost +EmailFrom = user@localhost # Email To -Email_To = root@localhost +EmailTo = root@localhost diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp index 2b8ef35d..13563c58 100644 --- a/lib/Plugins/Mailx.cpp +++ b/lib/Plugins/Mailx.cpp @@ -111,13 +111,13 @@ void CMailx::Report(const crash_report_t& pReport) void CMailx::SetSettings(const map_settings_t& pSettings) { - if (pSettings.find("Email_From")!= pSettings.end()) + if (pSettings.find("EmailFrom")!= pSettings.end()) { - m_sEmailFrom = pSettings.find("Email_From")->second; + m_sEmailFrom = pSettings.find("EmailFrom")->second; } - if (pSettings.find("Email_To")!= pSettings.end()) + if (pSettings.find("EmailTo")!= pSettings.end()) { - m_sEmailTo = pSettings.find("Email_To")->second; + m_sEmailTo = pSettings.find("EmailTo")->second; } if (pSettings.find("Parameters")!= pSettings.end()) { -- cgit