int main(int argc, char **argv)
{
- fprintf(stderr, "\nCubemap " SERVER_VERSION " starting.\n");
-
// Parse options.
int state_fd = -1;
+ bool test_config = false;
for ( ;; ) {
static const option long_options[] = {
{ "state", required_argument, 0, 's' },
+ { "test-config", no_argument, 0, 't' },
};
int option_index = 0;
- int c = getopt_long (argc, argv, "s:", long_options, &option_index);
+ int c = getopt_long (argc, argv, "s:t", long_options, &option_index);
if (c == -1) {
break;
case 's':
state_fd = atoi(optarg);
break;
+ case 't':
+ test_config = true;
+ break;
default:
assert(false);
}
if (!parse_config(config_filename, &config)) {
exit(1);
}
+ if (test_config) {
+ exit(0);
+ }
+ fprintf(stderr, "\nCubemap " SERVER_VERSION " starting.\n");
servers = new ServerPool(config.num_servers);
CubemapStateProto loaded_state;
create_input(loaded_state.inputs(i))));
}
- // Convert the acceptor from older serialized formats.
- if (loaded_state.has_server_sock() && loaded_state.has_port()) {
- AcceptorProto *acceptor = loaded_state.add_acceptors();
- acceptor->set_server_sock(loaded_state.server_sock());
- acceptor->set_port(loaded_state.port());
- }
-
// Deserialize the acceptors.
for (int i = 0; i < loaded_state.acceptors_size(); ++i) {
deserialized_acceptors.insert(make_pair(