Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
214b45dd
Commit
214b45dd
authored
Jun 20, 2018
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Respect changes to member variables
parent
0ea83cec
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
5 deletions
+15
-5
libcaf_core/src/actor_system_config.cpp
libcaf_core/src/actor_system_config.cpp
+15
-5
No files found.
libcaf_core/src/actor_system_config.cpp
View file @
214b45dd
...
@@ -82,14 +82,15 @@ actor_system_config::actor_system_config()
...
@@ -82,14 +82,15 @@ actor_system_config::actor_system_config()
logger_console_format
=
"%m"
;
logger_console_format
=
"%m"
;
logger_verbosity
=
atom
(
"trace"
);
logger_verbosity
=
atom
(
"trace"
);
logger_inline_output
=
false
;
logger_inline_output
=
false
;
middleman_network_backend
=
defaults
::
middleman
::
network_backend
;
namespace
mm
=
defaults
::
middleman
;
middleman_network_backend
=
mm
::
network_backend
;
middleman_enable_automatic_connections
=
false
;
middleman_enable_automatic_connections
=
false
;
middleman_max_consecutive_reads
=
defaults
::
middleman
::
max_consecutive_reads
;
middleman_max_consecutive_reads
=
mm
::
max_consecutive_reads
;
middleman_heartbeat_interval
=
defaults
::
middleman
::
heartbeat_interval
;
middleman_heartbeat_interval
=
mm
::
heartbeat_interval
;
middleman_detach_utility_actors
=
true
;
middleman_detach_utility_actors
=
true
;
middleman_detach_multiplexer
=
true
;
middleman_detach_multiplexer
=
true
;
middleman_cached_udp_buffers
=
defaults
::
middleman
::
cached_udp_buffers
;
middleman_cached_udp_buffers
=
mm
::
cached_udp_buffers
;
middleman_max_pending_msgs
=
defaults
::
middleman
::
max_pending_msgs
;
middleman_max_pending_msgs
=
mm
::
max_pending_msgs
;
// fill our options vector for creating INI and CLI parsers
// fill our options vector for creating INI and CLI parsers
opt_group
{
custom_options_
,
"global"
}
opt_group
{
custom_options_
,
"global"
}
.
add
<
bool
>
(
"help,h?"
,
"print help and exit"
)
.
add
<
bool
>
(
"help,h?"
,
"print help and exit"
)
...
@@ -282,6 +283,15 @@ bool operator!=(ini_iter iter, ini_sentinel) {
...
@@ -282,6 +283,15 @@ bool operator!=(ini_iter iter, ini_sentinel) {
actor_system_config
&
actor_system_config
::
parse
(
string_list
args
,
actor_system_config
&
actor_system_config
::
parse
(
string_list
args
,
std
::
istream
&
ini
)
{
std
::
istream
&
ini
)
{
// Insert possibly user-defined values into the map to respect overrides to
// member variables.
// TODO: remove with CAF 0.17
for
(
auto
&
opt
:
custom_options_
)
{
auto
val
=
opt
.
get
();
auto
fn
=
opt
.
full_name
();
if
(
val
)
content
[
opt
.
category
()][
opt
.
long_name
()]
=
std
::
move
(
*
val
);
}
// Content of the INI file overrides hard-coded defaults.
// Content of the INI file overrides hard-coded defaults.
if
(
ini
.
good
())
{
if
(
ini
.
good
())
{
detail
::
ini_consumer
consumer
{
custom_options_
,
content
};
detail
::
ini_consumer
consumer
{
custom_options_
,
content
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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