summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZdenek Prikryl <zdeny@dhcp-lab-218.englab.brq.redhat.com>2009-04-02 14:26:23 +0200
committerZdenek Prikryl <zdeny@dhcp-lab-218.englab.brq.redhat.com>2009-04-02 14:26:23 +0200
commitc58721b102040ac162787179fa2d3cf91396064d (patch)
treefe262c7186273f7e43f5df7b2e22f045c63a0197
parentfd1adf298726ccb55bbc8b4801543be6e3e0befb (diff)
downloadabrt-c58721b102040ac162787179fa2d3cf91396064d.tar.gz
abrt-c58721b102040ac162787179fa2d3cf91396064d.tar.xz
abrt-c58721b102040ac162787179fa2d3cf91396064d.zip
added support for action plugin in settings
-rw-r--r--lib/MiddleWare/MiddleWare.cpp5
-rw-r--r--lib/MiddleWare/MiddleWare.h3
-rw-r--r--src/Daemon/CrashWatcher.cpp6
-rw-r--r--src/Daemon/Settings.cpp10
4 files changed, 15 insertions, 9 deletions
diff --git a/lib/MiddleWare/MiddleWare.cpp b/lib/MiddleWare/MiddleWare.cpp
index a99fb6e..118bab0 100644
--- a/lib/MiddleWare/MiddleWare.cpp
+++ b/lib/MiddleWare/MiddleWare.cpp
@@ -448,7 +448,8 @@ void CMiddleWare::AddAnalyzerReporter(const std::string& pAnalyzer,
}
void CMiddleWare::AddAnalyzerAction(const std::string& pAnalyzer,
- const set_actions_t& pActions)
+ const std::string& pAction,
+ const std::string& pArgs)
{
- m_mapAnalyzerActions[pAnalyzer] = pActions;
+ m_mapAnalyzerActions[pAnalyzer].insert(make_pair(pAction, pArgs));
}
diff --git a/lib/MiddleWare/MiddleWare.h b/lib/MiddleWare/MiddleWare.h
index 7774954..5eafce8 100644
--- a/lib/MiddleWare/MiddleWare.h
+++ b/lib/MiddleWare/MiddleWare.h
@@ -98,7 +98,8 @@ class CMiddleWare
void AddAnalyzerReporter(const std::string& pAnalyzer,
const std::string& pReporter);
void AddAnalyzerAction(const std::string& pAnalyzer,
- const set_actions_t& pActions);
+ const std::string& pAction,
+ const std::string& pArgs);
};
#endif /*MIDDLEWARE_H_*/
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index ea7397f..fac346c 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -156,7 +156,11 @@ void CCrashWatcher::SetUpMW()
CSettings::map_analyzer_actions_t::iterator it_pa;
for (it_pa = actions.begin(); it_pa != actions.end(); it_pa++)
{
- m_pMW->AddAnalyzerAction(it_pa->first, it_pa->second);
+ CSettings::set_actions_t::iterator it_a;
+ for (it_a = it_pa->second.begin(); it_a != it_pa->second.end(); it_a++)
+ {
+ m_pMW->AddAnalyzerAction(it_pa->first, (*it_a).first, (*it_a).second);
+ }
}
}
diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp
index 44070d4..bf412eb 100644
--- a/src/Daemon/Settings.cpp
+++ b/src/Daemon/Settings.cpp
@@ -161,7 +161,7 @@ CSettings::set_actions_t CSettings::ParseActionValue(const std::string& pValue)
}
else if ((pValue[ii] == ',' || pValue[ii] == ')') && !is_quote && is_arg)
{
- //singleActions.isert(make_pair(action, item));
+ singleActions.insert(make_pair(action, item));
item = "";
if (pValue[ii] == ')')
{
@@ -171,9 +171,9 @@ CSettings::set_actions_t CSettings::ParseActionValue(const std::string& pValue)
}
else if (pValue[ii] == ',' && !is_quote && !is_arg)
{
- if (item != "")
+ if (item != "")
{
- //singleActions.isert(make_pair(item, ""));
+ singleActions.insert(make_pair(item, ""));
item = "";
}
}
@@ -184,8 +184,8 @@ CSettings::set_actions_t CSettings::ParseActionValue(const std::string& pValue)
}
if (item != "")
{
- //singleActions.insert(make_pair(item, ""));
- action = "";
+ singleActions.insert(make_pair(item, ""));
+ action = "";
}
return singleActions;
}