Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sebastian Schrader
Kea
Commits
a4e38252
Commit
a4e38252
authored
Mar 21, 2017
by
Francis Dupont
Browse files
[5150a] Changed module by app_name as it can be reserved on some C++ extensions
parent
947a8d68
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/lib/process/d_controller.cc
View file @
a4e38252
...
...
@@ -491,7 +491,7 @@ ConstElementPtr
DControllerBase
::
configTestHandler
(
const
std
::
string
&
,
ConstElementPtr
args
)
{
const
int
status_code
=
COMMAND_ERROR
;
// 1 indicates an error
ConstElementPtr
module_config
;
std
::
string
modul
e
=
getAppName
();
std
::
string
app_nam
e
=
getAppName
();
std
::
string
message
;
// Command arguments are expected to be:
...
...
@@ -501,11 +501,11 @@ DControllerBase::configTestHandler(const std::string&, ConstElementPtr args) {
if
(
!
args
)
{
message
=
"Missing mandatory 'arguments' parameter."
;
}
else
{
module_config
=
args
->
get
(
modul
e
);
module_config
=
args
->
get
(
app_nam
e
);
if
(
!
module_config
)
{
message
=
"Missing mandatory '"
+
modul
e
+
"' parameter."
;
message
=
"Missing mandatory '"
+
app_nam
e
+
"' parameter."
;
}
else
if
(
module_config
->
getType
()
!=
Element
::
map
)
{
message
=
"'"
+
modul
e
+
"' parameter expected to be a map."
;
message
=
"'"
+
app_nam
e
+
"' parameter expected to be a map."
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment