Commit 56e41930 authored by Dominik Charousset's avatar Dominik Charousset

Remove `init` function from config, relates #468

parent fb005263
......@@ -181,7 +181,7 @@ public:
std::string host = "localhost";
bool server_mode = false;
void init() override {
config() {
opt_group{custom_options_, "global"}
.add(port, "port,p", "set port")
.add(host, "host,H", "set host (ignored in server mode)")
......
......@@ -70,7 +70,7 @@ class config : public actor_system_config {
public:
uint16_t port = 0;
void init() override {
config() {
opt_group{custom_options_, "global"}
.add(port, "port,p", "set port");
}
......
......@@ -86,7 +86,7 @@ void testee(event_based_actor* self, size_t remaining) {
class config : public actor_system_config {
public:
void init() override {
config() {
add_message_type<foo>("foo");
add_message_type<foo2>("foo2");
add_message_type<foo_pair>("foo_pair");
......
......@@ -65,7 +65,7 @@ behavior testee(event_based_actor* self) {
class config : public actor_system_config {
public:
void init() override {
config() {
add_message_type<foo>("foo");
}
};
......
......@@ -81,7 +81,7 @@ behavior testee(event_based_actor* self) {
class config : public actor_system_config {
public:
void init() override {
config() {
add_message_type<foo>("foo");
}
};
......
......@@ -49,7 +49,7 @@ divider::behavior_type divider_impl() {
class config : public actor_system_config {
public:
void init() override {
config() {
auto renderer = [](uint8_t x, atom_value, const message&) {
return "math_error" + deep_to_string_as_tuple(static_cast<math_error>(x));
};
......
......@@ -253,7 +253,7 @@ public:
std::string host = "localhost";
bool server_mode = false;
void init() override {
config() {
opt_group{custom_options_, "global"}
.add(port, "port,p", "set port")
.add(host, "host,H", "set host (ignored in server mode)")
......
......@@ -68,7 +68,7 @@ public:
std::string name;
std::string group_id;
void init() override {
config() {
opt_group{custom_options_, "global"}
.add(name, "name,n", "set name")
.add(group_id, "group,g", "join group");
......
......@@ -24,7 +24,7 @@ class config : public actor_system_config {
public:
uint16_t port = 0;
void init() override {
config() {
opt_group{custom_options_, "global"}
.add(port, "port,p", "set port");
}
......
......@@ -212,8 +212,6 @@ public:
int (*slave_mode_fun)(actor_system&, const actor_system_config&);
protected:
virtual void init();
virtual std::string make_help_text(const std::vector<message::cli_arg>&);
options_vector custom_options_;
......
......@@ -173,7 +173,6 @@ actor_system_config::make_help_text(const std::vector<message::cli_arg>& xs) {
actor_system_config& actor_system_config::parse(int argc, char** argv,
const char* ini_file_cstr) {
init();
auto args = message_builder(argv + 1, argv + argc).move_to_message();
// extract config file name first, since INI files are overruled by CLI args
std::string config_file_name;
......@@ -287,10 +286,6 @@ actor_system_config& actor_system_config::set(const char* cn, config_value cv) {
return *this;
}
void actor_system_config::init() {
// nop
}
std::string actor_system_config::render_sec(uint8_t x, atom_value,
const message&) {
return "system_error" + deep_to_string_as_tuple(static_cast<sec>(x));
......
......@@ -34,24 +34,23 @@ namespace {
constexpr char local_host[] = "127.0.0.1";
class custom_config : public caf::actor_system_config {
class config : public caf::actor_system_config {
public:
void init() override {
config() {
load<caf::io::middleman>();
add_message_type<std::vector<int>>("std::vector<int>");
}
using actor_system_config::parse;
custom_config& parse() {
parse(caf::test::engine::argc(), caf::test::engine::argv());
config& parse() {
actor_system_config::parse(caf::test::engine::argc(),
caf::test::engine::argv());
return *this;
}
};
struct fixture {
caf::actor_system server_side{custom_config{}.parse()};
caf::actor_system client_side{custom_config{}.parse()};
caf::actor_system server_side{config{}.parse()};
caf::actor_system client_side{config{}.parse()};
caf::io::middleman& server_side_mm = server_side.middleman();
caf::io::middleman& client_side_mm = client_side.middleman();
};
......
......@@ -34,24 +34,23 @@ namespace {
constexpr char local_host[] = "127.0.0.1";
class custom_config : public caf::actor_system_config {
class config : public caf::actor_system_config {
public:
void init() override {
config() {
load<caf::io::middleman>();
add_message_type<std::vector<actor>>("std::vector<actor>");
}
using actor_system_config::parse;
custom_config& parse() {
parse(caf::test::engine::argc(), caf::test::engine::argv());
config& parse() {
actor_system_config::parse(caf::test::engine::argc(),
caf::test::engine::argv());
return *this;
}
};
struct fixture {
caf::actor_system server_side{custom_config{}.parse()};
caf::actor_system client_side{custom_config{}.parse()};
caf::actor_system server_side{config{}.parse()};
caf::actor_system client_side{config{}.parse()};
io::middleman& server_side_mm = server_side.middleman();
io::middleman& client_side_mm = client_side.middleman();
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment