goto free_cf;
if (ret == -ERRNO_TO_PARA_ERROR(ENOENT) && OPT_GIVEN(CONFIG_FILE))
goto free_cf;
- ret = 0;
server_lpr = cmdline_lpr;
goto success;
}
if (reload) /* config file overrides command line */
ret = lls(lls_merge(cf_lpr, cmdline_lpr, CMD_PTR, &merged_lpr,
&errctx));
- else /* command line options overrride config file options */
+ else /* command line options override config file options */
ret = lls(lls_merge(cmdline_lpr, cf_lpr, CMD_PTR, &merged_lpr,
&errctx));
lls_free_parse_result(cf_lpr, CMD_PTR);
ret = para_accept(sct->listen_fd, &s->rfds, NULL, 0, &new_fd);
if (ret <= 0)
goto out;
- peer_name = remote_name(new_fd);
- PARA_INFO_LOG("got connection from %s, forking\n", peer_name);
mmd->num_connects++;
mmd->active_connections++;
/*
/* parent keeps accepting connections */
return 0;
}
+ peer_name = remote_name(new_fd);
+ PARA_INFO_LOG("accepted connection from %s\n", peer_name);
/* mmd might already have changed at this point */
free(chunk_table);
alarm(ALARM_TIMEOUT);
init_signal_task();
para_unblock_signal(SIGCHLD);
PARA_NOTICE_LOG("initializing virtual streaming system\n");
- init_vss_task(afs_socket, &sched);
+ vss_init(afs_socket, &sched);
init_server_command_task(argc, argv);
if (daemon_pipe >= 0) {
if (write(daemon_pipe, "\0", 1) < 0) {