Skip to content

Commit

Permalink
Addressing further comments from @timmaxw and @larkost
Browse files Browse the repository at this point in the history
The agreement should be, as per @timmaxv's latest comment: a message
goes to NOTICE if the answer to the question "Is this message useful
for a user running RethinkDB manually?" is yes.
  • Loading branch information
sturmer committed Oct 7, 2014
1 parent c1a3f2a commit 3e78aa6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/clustering/administration/main/command_line.cc
Expand Up @@ -805,7 +805,7 @@ void run_rethinkdb_serve(const base_path_t &base_path,
}


logINF("Loading data from directory %s\n", base_path.path().c_str());
logNTC("Loading data from directory %s\n", base_path.path().c_str());

io_backender_t io_backender(direct_io_mode, max_concurrent_io_requests);

Expand Down Expand Up @@ -878,7 +878,7 @@ void run_rethinkdb_porcelain(const base_path_t &base_path,
NULL, NULL, data_directory_lock,
result_out);
} else {
logINF("Initializing directory %s\n", base_path.path().c_str());
logNTC("Initializing directory %s\n", base_path.path().c_str());

machine_id_t our_machine_id = generate_uuid();

Expand Down
12 changes: 6 additions & 6 deletions src/clustering/administration/main/serve.cc
Expand Up @@ -187,7 +187,7 @@ bool do_serve(io_backender_t *io_backender,
if (serve_info.ports.port != 0) {
guarantee(serve_info.ports.port == connectivity_cluster_run->get_port());
}
logINF("Listening for intracluster connections on port %d\n",
logNTC("Listening for intracluster connections on port %d\n",
connectivity_cluster_run->get_port());

auto_reconnector_t auto_reconnector(
Expand Down Expand Up @@ -302,7 +302,7 @@ bool do_serve(io_backender_t *io_backender,
serve_info.ports.local_addresses,
serve_info.ports.reql_port,
&rdb_ctx);
logINF("Listening for client driver connections on port %d\n",
logNTC("Listening for client driver connections on port %d\n",
rdb_query_server.get_port());

scoped_ptr_t<metadata_persistence::semilattice_watching_persister_t<cluster_semilattice_metadata_t> >
Expand Down Expand Up @@ -340,20 +340,20 @@ bool do_serve(io_backender_t *io_backender,
rdb_query_server.get_http_app(),
machine_id,
serve_info.web_assets));
logINF("Listening for administrative HTTP connections on port %d\n",
logNTC("Listening for administrative HTTP connections on port %d\n",
admin_server_ptr->get_port());
}

const std::string addresses_string = serve_info.ports.get_addresses_string();
logNTC("Listening on addresses: %s\n", addresses_string.c_str());

if (!serve_info.ports.is_bind_all()) {
logINF("To fully expose RethinkDB on the network, bind to all addresses");
logNTC("To fully expose RethinkDB on the network, bind to all addresses");
if(serve_info.config_file) {
logINF("by adding `bind=all' to the config file (%s).",
logNTC("by adding `bind=all' to the config file (%s).",
(*serve_info.config_file).c_str());
} else {
logINF("by running rethinkdb with the `--bind all` command line option.");
logNTC("by running rethinkdb with the `--bind all` command line option.");
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/clustering/administration/network_logger.cc
Expand Up @@ -49,15 +49,15 @@ void network_logger_t::on_change() {
if (jt != _semilattice.machines.end()) {
if (parent->connected_servers.count(it->second.machine_id) == 0) {
parent->connected_servers.insert(it->second.machine_id);
logINF("Connected to server %s", parent->pretty_print_machine(it->second.machine_id).c_str());
logNTC("Connected to server %s", parent->pretty_print_machine(it->second.machine_id).c_str());
}
}
break;
}
case PROXY_PEER: {
_proxies_seen->insert(it->first);
if (parent->connected_proxies.count(it->first)) {
logINF("Connected to proxy %s", uuid_to_str(it->first.get_uuid()).c_str());
logNTC("Connected to proxy %s", uuid_to_str(it->first.get_uuid()).c_str());
}
break;
}
Expand Down

0 comments on commit 3e78aa6

Please sign in to comment.