summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Daemon/DBusServerProxy.h22
-rw-r--r--src/Daemon/Daemon.cpp17
-rw-r--r--src/Daemon/MiddleWare.cpp6
-rw-r--r--src/Daemon/MiddleWare.h10
-rw-r--r--src/Daemon/Settings.h3
5 files changed, 26 insertions, 32 deletions
diff --git a/src/Daemon/DBusServerProxy.h b/src/Daemon/DBusServerProxy.h
index a68a44f..2053841 100644
--- a/src/Daemon/DBusServerProxy.h
+++ b/src/Daemon/DBusServerProxy.h
@@ -43,17 +43,17 @@ public:
* you will have to implement them in your ObjectAdaptor
*/
- virtual vector_crash_infos_t GetCrashInfos(const std::string &pDBusSender) = 0;
- virtual map_crash_report_t CreateReport(const std::string &pUUID, const std::string &pDBusSender) = 0;
- virtual uint64_t CreateReport_t(const std::string &pUUID, const std::string &pDBusSender) = 0;
- virtual report_status_t Report(map_crash_report_t pReport, const std::string &pDBusSender) = 0;
- virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pDBusSender) = 0;
- virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string& pDBusSender) = 0;
- virtual vector_map_string_string_t GetPluginsInfo() = 0;
- virtual map_plugin_settings_t GetPluginSettings(const std::string& pName, const std::string& pDBusSender) = 0;
- virtual void SetPluginSettings(const std::string& pName, const std::string& pSender, const map_plugin_settings_t& pSettings) = 0;
- virtual void RegisterPlugin(const std::string& pName) = 0;
- virtual void UnRegisterPlugin(const std::string& pName) = 0;
+ virtual vector_crash_infos_t GetCrashInfos(const std::string &pDBusSender) = 0;
+ virtual map_crash_report_t CreateReport(const std::string &pUUID, const std::string &pDBusSender) = 0;
+ virtual uint64_t CreateReport_t(const std::string &pUUID, const std::string &pDBusSender) = 0;
+ virtual report_status_t Report(map_crash_report_t pReport, const std::string &pDBusSender) = 0;
+ virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pDBusSender) = 0;
+ virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string& pDBusSender) = 0;
+ virtual vector_map_string_string_t GetPluginsInfo() = 0;
+ virtual map_plugin_settings_t GetPluginSettings(const std::string& pName, const std::string& pDBusSender) = 0;
+ virtual void SetPluginSettings(const std::string& pName, const std::string& pSender, const map_plugin_settings_t& pSettings) = 0;
+ virtual void RegisterPlugin(const std::string& pName) = 0;
+ virtual void UnRegisterPlugin(const std::string& pName) = 0;
public:
/* signal emitters for this interface
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index f0b60eb..cb9e7dd 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -48,8 +48,6 @@ typedef struct cron_callback_data_t
static uint8_t sig_caught; /* = 0 */
-static int g_nFd;
-static GIOChannel* g_pGio;
static GMainLoop* g_pMainloop;
static CSettings* g_pSettings;
@@ -535,6 +533,7 @@ static gboolean handle_event_cb(GIOChannel *gio, GIOCondition condition, gpointe
int main(int argc, char** argv)
{
+ GIOChannel* pGio;
int daemonize = 0;
signal(SIGTERM, handle_fatal_signal);
@@ -587,10 +586,10 @@ int main(int argc, char** argv)
comm_layer_inner_init(&watcher);
/* Watching DEBUG_DUMPS_DIR for new files... */
errno = 0;
- g_nFd = inotify_init();
- if (g_nFd == -1)
+ int inotify_fd = inotify_init();
+ if (inotify_fd == -1)
perror_msg_and_die("inotify_init failed");
- if (inotify_add_watch(g_nFd, DEBUG_DUMPS_DIR, IN_CREATE) == -1)
+ if (inotify_add_watch(inotify_fd, DEBUG_DUMPS_DIR, IN_CREATE) == -1)
perror_msg_and_die("inotify_add_watch failed on '%s'", DEBUG_DUMPS_DIR);
/* (comment here) */
g_pSettings = new CSettings();
@@ -610,8 +609,8 @@ int main(int argc, char** argv)
#endif
g_pCommLayer->Attach(&watcher);
/* (comment here) */
- g_pGio = g_io_channel_unix_new(g_nFd);
- g_io_add_watch(g_pGio, G_IO_IN, handle_event_cb, NULL);
+ pGio = g_io_channel_unix_new(inotify_fd);
+ g_io_add_watch(pGio, G_IO_IN, handle_event_cb, NULL);
/* Add an event source which waits for INT/TERM signal */
GSourceFuncs waitsignal_funcs;
memset(&waitsignal_funcs, 0, sizeof(waitsignal_funcs));
@@ -630,7 +629,7 @@ int main(int argc, char** argv)
/* Initialization error. Clean up, in reverse order */
unlink(VAR_RUN_PIDFILE);
unlink(VAR_RUN_LOCK_FILE);
- g_io_channel_unref(g_pGio);
+ g_io_channel_unref(pGio);
delete g_pCommLayer;
/* This restores /proc/sys/kernel/core_pattern, among other things: */
delete g_pMW;
@@ -668,7 +667,7 @@ int main(int argc, char** argv)
/* Error or INT/TERM. Clean up, in reverse order */
unlink(VAR_RUN_PIDFILE);
unlink(VAR_RUN_LOCK_FILE);
- g_io_channel_unref(g_pGio);
+ g_io_channel_unref(pGio);
delete g_pCommLayer;
/* This restores /proc/sys/kernel/core_pattern, among other things: */
delete g_pMW;
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index d0bdc62..9107b80 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -226,7 +226,7 @@ void CMiddleWare::RunAction(const std::string& pActionDir,
void CMiddleWare::RunActionsAndReporters(const std::string& pDebugDumpDir)
{
- vector_actions_and_reporters_t::iterator it_ar;
+ vector_pair_string_string_t::iterator it_ar;
for (it_ar = m_vectorActionsAndReporters.begin(); it_ar != m_vectorActionsAndReporters.end(); it_ar++)
{
try
@@ -284,7 +284,7 @@ CMiddleWare::report_status_t CMiddleWare::Report(const map_crash_report_t& pCras
if (m_mapAnalyzerActionsAndReporters.find(analyzer) != m_mapAnalyzerActionsAndReporters.end())
{
- vector_actions_and_reporters_t::iterator it_r;
+ vector_pair_string_string_t::iterator it_r;
for (it_r = m_mapAnalyzerActionsAndReporters[analyzer].begin();
it_r != m_mapAnalyzerActionsAndReporters[analyzer].end();
it_r++)
@@ -464,7 +464,7 @@ void CMiddleWare::RunAnalyzerActions(const std::string& pAnalyzer, const std::st
{
if (m_mapAnalyzerActionsAndReporters.find(pAnalyzer) != m_mapAnalyzerActionsAndReporters.end())
{
- vector_actions_and_reporters_t::iterator it_a;
+ vector_pair_string_string_t::iterator it_a;
for (it_a = m_mapAnalyzerActionsAndReporters[pAnalyzer].begin();
it_a != m_mapAnalyzerActionsAndReporters[pAnalyzer].end();
it_a++)
diff --git a/src/Daemon/MiddleWare.h b/src/Daemon/MiddleWare.h
index 87d6522..04541e9 100644
--- a/src/Daemon/MiddleWare.h
+++ b/src/Daemon/MiddleWare.h
@@ -62,11 +62,7 @@ class CMiddleWare
} report_status_items_t;
private:
- typedef set_strings_t set_blacklist_t;
- typedef set_strings_t set_enabled_plugins_t;
- typedef std::vector<pair_string_string_t> vector_pairt_strings_t;
- typedef vector_pairt_strings_t vector_actions_and_reporters_t;
- typedef std::map<std::string, vector_actions_and_reporters_t> map_analyzer_actions_and_reporters_t;
+ typedef std::map<std::string, vector_pair_string_string_t> map_analyzer_actions_and_reporters_t;
/**
* An instance of CPluginManager. When MiddleWare wants to do something
@@ -82,7 +78,7 @@ class CMiddleWare
/**
* A set of blacklisted packages.
*/
- set_blacklist_t m_setBlackList;
+ set_strings_t m_setBlackList;
/**
* A name of database plugin, which is used for metadata.
*/
@@ -97,7 +93,7 @@ class CMiddleWare
* A vector of one or more action or reporter plugins. These are
* activated when any crash occurs.
*/
- vector_actions_and_reporters_t m_vectorActionsAndReporters;
+ vector_pair_string_string_t m_vectorActionsAndReporters;
/**
* Plugins configuration directory (e.g. /etc/abrt/plugins, ...).
*/
diff --git a/src/Daemon/Settings.h b/src/Daemon/Settings.h
index ccedd72..d4e54f5 100644
--- a/src/Daemon/Settings.h
+++ b/src/Daemon/Settings.h
@@ -13,7 +13,6 @@ class CSettings
typedef std::set<std::string> set_strings_t;
typedef std::pair<std::string, std::string> pair_string_string_t;
typedef std::vector<pair_string_string_t> vector_pair_strings_t;
- typedef vector_pair_strings_t vector_actions_and_reporters_t;
typedef std::map<std::string, vector_pair_strings_t> map_analyzer_actions_and_reporters_t;
typedef std::map<std::string, vector_pair_strings_t> map_cron_t;
@@ -26,7 +25,7 @@ class CSettings
set_strings_t m_setBlackList;
set_strings_t m_setEnabledPlugins;
std::string m_sDatabase;
- vector_actions_and_reporters_t m_vectorActionsAndReporters;
+ vector_pair_string_string_t m_vectorActionsAndReporters;
map_cron_t m_mapCron;
bool m_bOpenGPGCheck;
generated by cgit (git 2.34.1) at 2026-01-07 22:33:34 +0000