Commit a287b288 authored by Joseph Noir's avatar Joseph Noir

Make automatic connectivity the default

parent eefbae4b
...@@ -133,7 +133,7 @@ actor_system_config::actor_system_config() ...@@ -133,7 +133,7 @@ actor_system_config::actor_system_config()
logger_verbosity = atom("trace"); logger_verbosity = atom("trace");
logger_inline_output = false; logger_inline_output = false;
middleman_network_backend = atom("default"); middleman_network_backend = atom("default");
middleman_enable_automatic_connections = false; middleman_enable_automatic_connections = true;
middleman_max_consecutive_reads = 50; middleman_max_consecutive_reads = 50;
middleman_heartbeat_interval = 0; middleman_heartbeat_interval = 0;
middleman_detach_utility_actors = true; middleman_detach_utility_actors = true;
......
...@@ -349,7 +349,6 @@ public: ...@@ -349,7 +349,6 @@ public:
auto config_server = system().registry().get(atom("ConfigServ")); auto config_server = system().registry().get(atom("ConfigServ"));
anon_send(actor_cast<actor>(config_server), put_atom::value, anon_send(actor_cast<actor>(config_server), put_atom::value,
to_string(hdr.source_node), make_message(addrs)); to_string(hdr.source_node), make_message(addrs));
// TODO: Add addresses to share with other nodes?
// Write handshake as client in response. // Write handshake as client in response.
if (tcp_based) if (tcp_based)
write_client_handshake(ctx, callee_.get_buffer(hdl), hdr.source_node); write_client_handshake(ctx, callee_.get_buffer(hdl), hdr.source_node);
......
...@@ -211,6 +211,7 @@ void abstract_broker::add_datagram_servant(datagram_servant_ptr ptr) { ...@@ -211,6 +211,7 @@ void abstract_broker::add_datagram_servant(datagram_servant_ptr ptr) {
ptr->set_parent(this); ptr->set_parent(this);
auto hdls = ptr->hdls(); auto hdls = ptr->hdls();
launch_servant(ptr); launch_servant(ptr);
add_hdl_for_datagram_servant(ptr, ptr->hdl());
for (auto& hdl : hdls) for (auto& hdl : hdls)
add_hdl_for_datagram_servant(ptr, hdl); add_hdl_for_datagram_servant(ptr, hdl);
} }
......
...@@ -39,6 +39,8 @@ class config : public actor_system_config { ...@@ -39,6 +39,8 @@ class config : public actor_system_config {
public: public:
config() { config() {
load<io::middleman>(); load<io::middleman>();
set("middleman.enable-tcp", true);
set("middleman.enable-udp", false);
add_message_type<std::vector<int>>("std::vector<int>"); add_message_type<std::vector<int>>("std::vector<int>");
actor_system_config::parse(test::engine::argc(), actor_system_config::parse(test::engine::argc(),
test::engine::argv()); test::engine::argv());
......
...@@ -39,6 +39,7 @@ class config : public actor_system_config { ...@@ -39,6 +39,7 @@ class config : public actor_system_config {
public: public:
config() { config() {
load<io::middleman>(); load<io::middleman>();
set("middleman.enable-tcp", false);
set("middleman.enable-udp", true); set("middleman.enable-udp", true);
add_message_type<std::vector<int>>("std::vector<int>"); add_message_type<std::vector<int>>("std::vector<int>");
actor_system_config::parse(test::engine::argc(), actor_system_config::parse(test::engine::argc(),
......
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