diff options
author | Zdenek Prikryl <zdeny@dhcp-lab-218.englab.brq.redhat.com> | 2009-08-11 18:37:33 +0200 |
---|---|---|
committer | Zdenek Prikryl <zdeny@dhcp-lab-218.englab.brq.redhat.com> | 2009-08-11 18:37:33 +0200 |
commit | 3335a8cc4e772ed027e400cfac10b17c1536ad9f (patch) | |
tree | 5a5dca74ecd6b2ea5376f4ee9b73510b68cfa3db /lib | |
parent | c0a64f7f5ed5abc1f729177da84d496a49e10081 (diff) | |
download | abrt-3335a8cc4e772ed027e400cfac10b17c1536ad9f.tar.gz abrt-3335a8cc4e772ed027e400cfac10b17c1536ad9f.tar.xz abrt-3335a8cc4e772ed027e400cfac10b17c1536ad9f.zip |
moved LoadSettings from plugins into PluginManager
Diffstat (limited to 'lib')
-rw-r--r-- | lib/MiddleWare/Plugin.cpp | 62 | ||||
-rw-r--r-- | lib/MiddleWare/Plugin.h | 9 | ||||
-rw-r--r-- | lib/Plugins/CCpp.cpp | 8 | ||||
-rw-r--r-- | lib/Plugins/CCpp.h | 1 | ||||
-rw-r--r-- | lib/Plugins/FileTransfer.cpp | 8 | ||||
-rw-r--r-- | lib/Plugins/FileTransfer.h | 1 | ||||
-rw-r--r-- | lib/Plugins/KerneloopsReporter.cpp | 8 | ||||
-rw-r--r-- | lib/Plugins/KerneloopsReporter.h | 1 | ||||
-rw-r--r-- | lib/Plugins/KerneloopsScanner.cpp | 8 | ||||
-rw-r--r-- | lib/Plugins/KerneloopsScanner.h | 1 | ||||
-rw-r--r-- | lib/Plugins/Logger.cpp | 8 | ||||
-rw-r--r-- | lib/Plugins/Logger.h | 1 | ||||
-rw-r--r-- | lib/Plugins/Mailx.cpp | 8 | ||||
-rw-r--r-- | lib/Plugins/Mailx.h | 1 | ||||
-rw-r--r-- | lib/Plugins/SQLite3.cpp | 8 | ||||
-rw-r--r-- | lib/Plugins/SQLite3.h | 1 |
16 files changed, 1 insertions, 133 deletions
diff --git a/lib/MiddleWare/Plugin.cpp b/lib/MiddleWare/Plugin.cpp index cf2dff61..161ead8a 100644 --- a/lib/MiddleWare/Plugin.cpp +++ b/lib/MiddleWare/Plugin.cpp @@ -18,72 +18,10 @@ */ #include "Plugin.h" -#include <fstream> /* class CPlugin's virtuals */ CPlugin::~CPlugin() {} void CPlugin::Init() {} void CPlugin::DeInit() {} -void CPlugin::LoadSettings(const std::string& pPath) {} void CPlugin::SetSettings(const map_plugin_settings_t& pSettings) {} map_plugin_settings_t CPlugin::GetSettings() {return map_plugin_settings_t();} - -void plugin_load_settings(const std::string& path, map_plugin_settings_t& settings) -{ - std::ifstream fIn; - fIn.open(path.c_str()); - if (fIn.is_open()) - { - std::string line; - while (!fIn.eof()) - { - getline(fIn, line); - - int ii; - bool is_value = false; - bool valid = false; - bool in_quote = false; - std::string key = ""; - std::string value = ""; - for (ii = 0; ii < line.length(); ii++) - { - if (line[ii] == '\"') - { - in_quote = in_quote == true ? false : true; - } - if (isspace(line[ii]) && !in_quote) - { - continue; - } - if (line[ii] == '#' && !in_quote) - { - break; - } - else if (line[ii] == '=' && !in_quote) - { - is_value = true; - } - else if (line[ii] == '=' && is_value && !in_quote) - { - key = ""; - value = ""; - break; - } - else if (!is_value) - { - key += line[ii]; - } - else - { - valid = true; - value += line[ii]; - } - } - if (valid && !in_quote) - { - settings[key] = value; - } - } - fIn.close(); - } -} diff --git a/lib/MiddleWare/Plugin.h b/lib/MiddleWare/Plugin.h index d615fc8d..a0b64aea 100644 --- a/lib/MiddleWare/Plugin.h +++ b/lib/MiddleWare/Plugin.h @@ -26,7 +26,7 @@ #include <string> #include <map> -#define PLUGINS_MAGIC_NUMBER 4 +#define PLUGINS_MAGIC_NUMBER 5 #define PLUGINS_CONF_EXTENSION "conf" #define PLUGINS_LIB_EXTENSION "so" @@ -54,11 +54,6 @@ class CPlugin */ virtual void DeInit(); /** - * A method, which loads a plugin settings from a file. It is not mandatory method. - * @param pPath A path to plugin configuration file. - */ - virtual void LoadSettings(const std::string& pPath); - /** * A method, which takes a settings and apply them. It is not a mandatory method. * @param pSettings Plugin's settings */ @@ -112,6 +107,4 @@ typedef struct SPluginInfo PLUGINS_MAGIC_NUMBER,\ }; -void plugin_load_settings(const std::string& path, map_plugin_settings_t& settings); - #endif /* PLUGIN_H_ */ diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index 657e372b..80727dd3 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -552,14 +552,6 @@ void CAnalyzerCCpp::DeInit() } } -void CAnalyzerCCpp::LoadSettings(const std::string& pPath) -{ - map_plugin_settings_t settings; - plugin_load_settings(pPath, settings); - - SetSettings(settings); -} - void CAnalyzerCCpp::SetSettings(const map_plugin_settings_t& pSettings) { if (pSettings.find("MemoryMap") != pSettings.end()) diff --git a/lib/Plugins/CCpp.h b/lib/Plugins/CCpp.h index b14a90fa..b428a8ad 100644 --- a/lib/Plugins/CCpp.h +++ b/lib/Plugins/CCpp.h @@ -40,7 +40,6 @@ class CAnalyzerCCpp : public CAnalyzer virtual void CreateReport(const std::string& pDebugDumpDir); virtual void Init(); virtual void DeInit(); - virtual void LoadSettings(const std::string& pPath); virtual void SetSettings(const map_plugin_settings_t& pSettings); virtual map_plugin_settings_t GetSettings(); }; diff --git a/lib/Plugins/FileTransfer.cpp b/lib/Plugins/FileTransfer.cpp index 1aa724d6..981e574d 100644 --- a/lib/Plugins/FileTransfer.cpp +++ b/lib/Plugins/FileTransfer.cpp @@ -222,14 +222,6 @@ void CFileTransfer::Run(const std::string& pActiveDir, const std::string& pArgs) } } -void CFileTransfer::LoadSettings(const std::string& pPath) -{ - map_plugin_settings_t settings; - plugin_load_settings(pPath, settings); - - SetSettings(settings); -} - void CFileTransfer::SetSettings(const map_plugin_settings_t& pSettings) { if (pSettings.find("URL") != pSettings.end()) diff --git a/lib/Plugins/FileTransfer.h b/lib/Plugins/FileTransfer.h index 3f8be474..943c52f4 100644 --- a/lib/Plugins/FileTransfer.h +++ b/lib/Plugins/FileTransfer.h @@ -49,7 +49,6 @@ class CFileTransfer : public CAction m_nRetryDelay(20) {} - virtual void LoadSettings(const std::string& pPath); virtual void SetSettings(const map_plugin_settings_t& pSettings); virtual map_plugin_settings_t GetSettings(); virtual void Run(const std::string& pActiveDir, diff --git a/lib/Plugins/KerneloopsReporter.cpp b/lib/Plugins/KerneloopsReporter.cpp index d0aedb7f..1860fd8b 100644 --- a/lib/Plugins/KerneloopsReporter.cpp +++ b/lib/Plugins/KerneloopsReporter.cpp @@ -113,14 +113,6 @@ void CKerneloopsReporter::Report(const map_crash_report_t& pCrashReport, const s comm_layer_inner_status("Report has not been sent..."); } -void CKerneloopsReporter::LoadSettings(const std::string& pPath) -{ - map_plugin_settings_t settings; - plugin_load_settings(pPath, settings); - - SetSettings(settings); -} - void CKerneloopsReporter::SetSettings(const map_plugin_settings_t& pSettings) { if (pSettings.find("SubmitURL") != pSettings.end()) diff --git a/lib/Plugins/KerneloopsReporter.h b/lib/Plugins/KerneloopsReporter.h index 7dcd0e0c..c8295a7a 100644 --- a/lib/Plugins/KerneloopsReporter.h +++ b/lib/Plugins/KerneloopsReporter.h @@ -40,7 +40,6 @@ class CKerneloopsReporter : public CReporter public: CKerneloopsReporter(); - virtual void LoadSettings(const std::string& pPath); virtual void SetSettings(const map_plugin_settings_t& pSettings); virtual map_plugin_settings_t GetSettings(); virtual void Report(const map_crash_report_t& pCrashReport, diff --git a/lib/Plugins/KerneloopsScanner.cpp b/lib/Plugins/KerneloopsScanner.cpp index bab9e65b..32289f3b 100644 --- a/lib/Plugins/KerneloopsScanner.cpp +++ b/lib/Plugins/KerneloopsScanner.cpp @@ -169,14 +169,6 @@ int CKerneloopsScanner::ScanSysLogFile(const char *filename) return cnt_FoundOopses; } -void CKerneloopsScanner::LoadSettings(const std::string& pPath) -{ - map_plugin_settings_t settings; - plugin_load_settings(pPath, settings); - - SetSettings(settings); -} - void CKerneloopsScanner::SetSettings(const map_plugin_settings_t& pSettings) { if (pSettings.find("SysLogFile") != pSettings.end()) diff --git a/lib/Plugins/KerneloopsScanner.h b/lib/Plugins/KerneloopsScanner.h index 5ec5fbea..ca19a3a4 100644 --- a/lib/Plugins/KerneloopsScanner.h +++ b/lib/Plugins/KerneloopsScanner.h @@ -51,7 +51,6 @@ class CKerneloopsScanner : public CAction {} virtual void Run(const std::string& pActionDir, const std::string& pArgs); - virtual void LoadSettings(const std::string& pPath); virtual void SetSettings(const map_plugin_settings_t& pSettings); virtual map_plugin_settings_t GetSettings(); }; diff --git a/lib/Plugins/Logger.cpp b/lib/Plugins/Logger.cpp index 1dd5a28d..cb702276 100644 --- a/lib/Plugins/Logger.cpp +++ b/lib/Plugins/Logger.cpp @@ -30,14 +30,6 @@ CLogger::CLogger() : m_bAppendLogs(true) {} -void CLogger::LoadSettings(const std::string& pPath) -{ - map_plugin_settings_t settings; - plugin_load_settings(pPath, settings); - - SetSettings(settings); -} - void CLogger::SetSettings(const map_plugin_settings_t& pSettings) { if (pSettings.find("LogPath") != pSettings.end()) diff --git a/lib/Plugins/Logger.h b/lib/Plugins/Logger.h index 0c31dca9..c838b3cb 100644 --- a/lib/Plugins/Logger.h +++ b/lib/Plugins/Logger.h @@ -34,7 +34,6 @@ class CLogger : public CReporter public: CLogger(); - virtual void LoadSettings(const std::string& pPath); virtual void SetSettings(const map_plugin_settings_t& pSettings); virtual map_plugin_settings_t GetSettings(); virtual void Report(const map_crash_report_t& pCrashReport, diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp index d017d53f..5ee6b65d 100644 --- a/lib/Plugins/Mailx.cpp +++ b/lib/Plugins/Mailx.cpp @@ -137,14 +137,6 @@ void CMailx::Report(const map_crash_report_t& pCrashReport, const std::string& p } } -void CMailx::LoadSettings(const std::string& pPath) -{ - map_plugin_settings_t settings; - plugin_load_settings(pPath, settings); - - SetSettings(settings); -} - void CMailx::SetSettings(const map_plugin_settings_t& pSettings) { if (pSettings.find("Subject") != pSettings.end()) diff --git a/lib/Plugins/Mailx.h b/lib/Plugins/Mailx.h index 3cd88db4..b5d78364 100644 --- a/lib/Plugins/Mailx.h +++ b/lib/Plugins/Mailx.h @@ -42,7 +42,6 @@ class CMailx : public CReporter public: CMailx(); - virtual void LoadSettings(const std::string& pPath); virtual void SetSettings(const map_plugin_settings_t& pSettings); virtual map_plugin_settings_t GetSettings(); virtual void Report(const map_crash_report_t& pCrashReport, diff --git a/lib/Plugins/SQLite3.cpp b/lib/Plugins/SQLite3.cpp index ecf848e7..7720c409 100644 --- a/lib/Plugins/SQLite3.cpp +++ b/lib/Plugins/SQLite3.cpp @@ -267,14 +267,6 @@ const database_row_t CSQLite3::GetUUIDData(const std::string& pUUID, const std:: return table[0]; } -void CSQLite3::LoadSettings(const std::string& pPath) -{ - map_plugin_settings_t settings; - plugin_load_settings(pPath, settings); - - SetSettings(settings); -} - void CSQLite3::SetSettings(const map_plugin_settings_t& pSettings) { if (pSettings.find("DBPath") != pSettings.end()) diff --git a/lib/Plugins/SQLite3.h b/lib/Plugins/SQLite3.h index 99c3a8f8..987512e7 100644 --- a/lib/Plugins/SQLite3.h +++ b/lib/Plugins/SQLite3.h @@ -57,7 +57,6 @@ class CSQLite3 : public CDatabase virtual const vector_database_rows_t GetUIDData(const std::string& pUID); virtual const database_row_t GetUUIDData(const std::string& pUUID, const std::string& pUID); - virtual void LoadSettings(const std::string& pPath); virtual void SetSettings(const map_plugin_settings_t& pSettings); virtual map_plugin_settings_t GetSettings(); }; |