X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsessiond-config.c;h=d514aefc75e8ba85639cf0f80a3e9f5ec54b51fd;hp=d710eb4e5689ae8ee60a66db81a1c17d04ec83c3;hb=2a9f757b25bbd1e8e50304a789c898fd0bf3a168;hpb=4a08b740c96ec5b5eb11c6a5c82579c764d28dc6 diff --git a/src/bin/lttng-sessiond/sessiond-config.c b/src/bin/lttng-sessiond/sessiond-config.c index d710eb4e5..d514aefc7 100644 --- a/src/bin/lttng-sessiond/sessiond-config.c +++ b/src/bin/lttng-sessiond/sessiond-config.c @@ -32,7 +32,7 @@ struct sessiond_config sessiond_config_build_defaults = { .verbose = 0, .verbose_consumer = 0, - .agent_tcp_port = DEFAULT_AGENT_TCP_PORT, + .agent_tcp_port = { .begin = DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN, .end = DEFAULT_AGENT_TCP_PORT_RANGE_END }, .app_socket_timeout = DEFAULT_APP_SOCKET_RW_TIMEOUT, .no_kernel = false, @@ -269,6 +269,9 @@ int sessiond_config_init(struct sessiond_config *config) } else { ret = config_set_paths_non_root(config); } + if (ret < 0) { + goto end; + } /* 32 bits consumerd path setup */ ret = asprintf(&str, DEFAULT_USTCONSUMERD32_PATH, @@ -491,26 +494,45 @@ LTTNG_HIDDEN void sessiond_config_log(struct sessiond_config *config) { DBG_NO_LOC("[sessiond configuration]"); - DBG_NO_LOC("\tverbose: %i", config->verbose); - DBG_NO_LOC("\tverbose consumer: %i", config->verbose_consumer); - DBG_NO_LOC("\tquiet mode: %s", config->quiet ? "True" : "False"); - DBG_NO_LOC("\tagent_tcp_port: %i", config->agent_tcp_port); - DBG_NO_LOC("\tapplication socket timeout: %i", config->app_socket_timeout); - DBG_NO_LOC("\tno-kernel: %s", config->no_kernel ? "True" : "False"); - DBG_NO_LOC("\tbackground: %s", config->background ? "True" : "False"); - DBG_NO_LOC("\tdaemonize: %s", config->daemonize ? "True" : "False"); - DBG_NO_LOC("\tsignal parent on start: %s", config->sig_parent ? "True" : "False"); - DBG_NO_LOC("\ttracing group name: %s", config->tracing_group_name.value ? : "Unknown"); - DBG_NO_LOC("\tkmod_probe_list: %s", config->kmod_probes_list.value ? : "None"); - DBG_NO_LOC("\tkmod_extra_probe_list: %s", config->kmod_extra_probes_list.value ? : "None"); - DBG_NO_LOC("\trundir: %s", config->rundir.value ? : "Unknown"); - DBG_NO_LOC("\tapplication socket path: %s", config->apps_unix_sock_path.value ? : "Unknown"); - DBG_NO_LOC("\tclient socket path: %s", config->client_unix_sock_path.value ? : "Unknown"); - DBG_NO_LOC("\twait shm path: %s", config->wait_shm_path.value ? : "Unknown"); - DBG_NO_LOC("\thealth socket path: %s", config->health_unix_sock_path.value ? : "Unknown"); - DBG_NO_LOC("\tLTTNG_UST_CLOCK_PLUGIN: %s", config->lttng_ust_clock_plugin.value ? : "None"); - DBG_NO_LOC("\tpid file path: %s", config->pid_file_path.value ? : "Unknown"); - DBG_NO_LOC("\tlock file path: %s", config->lock_file_path.value ? : "Unknown"); - DBG_NO_LOC("\tsession load path: %s", config->load_session_path.value ? : "None"); - DBG_NO_LOC("\tagent port file path: %s", config->agent_port_file_path.value ? : "Unknown"); + DBG_NO_LOC("\tverbose: %i", config->verbose); + DBG_NO_LOC("\tverbose consumer: %i", config->verbose_consumer); + DBG_NO_LOC("\tquiet mode: %s", config->quiet ? "True" : "False"); + if (config->agent_tcp_port.begin == config->agent_tcp_port.end) { + DBG_NO_LOC("\tagent_tcp_port: %i", config->agent_tcp_port.begin); + } else { + DBG_NO_LOC("\tagent_tcp_port: [%i, %i]", + config->agent_tcp_port.begin, + config->agent_tcp_port.end); + } + DBG_NO_LOC("\tapplication socket timeout: %i", config->app_socket_timeout); + DBG_NO_LOC("\tno-kernel: %s", config->no_kernel ? "True" : "False"); + DBG_NO_LOC("\tbackground: %s", config->background ? "True" : "False"); + DBG_NO_LOC("\tdaemonize: %s", config->daemonize ? "True" : "False"); + DBG_NO_LOC("\tsignal parent on start: %s", config->sig_parent ? "True" : "False"); + DBG_NO_LOC("\ttracing group name: %s", config->tracing_group_name.value ? : "Unknown"); + DBG_NO_LOC("\tkmod_probe_list: %s", config->kmod_probes_list.value ? : "None"); + DBG_NO_LOC("\tkmod_extra_probe_list: %s", config->kmod_extra_probes_list.value ? : "None"); + DBG_NO_LOC("\trundir: %s", config->rundir.value ? : "Unknown"); + DBG_NO_LOC("\tapplication socket path: %s", config->apps_unix_sock_path.value ? : "Unknown"); + DBG_NO_LOC("\tclient socket path: %s", config->client_unix_sock_path.value ? : "Unknown"); + DBG_NO_LOC("\twait shm path: %s", config->wait_shm_path.value ? : "Unknown"); + DBG_NO_LOC("\thealth socket path: %s", config->health_unix_sock_path.value ? : "Unknown"); + DBG_NO_LOC("\tLTTNG_UST_CLOCK_PLUGIN: %s", config->lttng_ust_clock_plugin.value ? : "None"); + DBG_NO_LOC("\tpid file path: %s", config->pid_file_path.value ? : "Unknown"); + DBG_NO_LOC("\tlock file path: %s", config->lock_file_path.value ? : "Unknown"); + DBG_NO_LOC("\tsession load path: %s", config->load_session_path.value ? : "None"); + DBG_NO_LOC("\tagent port file path: %s", config->agent_port_file_path.value ? : "Unknown"); + DBG_NO_LOC("\tconsumerd32 path: %s", config->consumerd32_path.value ? : "Unknown"); + DBG_NO_LOC("\tconsumerd32 bin path: %s", config->consumerd32_bin_path.value ? : "Unknown"); + DBG_NO_LOC("\tconsumerd32 lib dir: %s", config->consumerd32_lib_dir.value ? : "Unknown"); + DBG_NO_LOC("\tconsumerd32 err unix sock path:%s", config->consumerd32_err_unix_sock_path.value ? : "Unknown"); + DBG_NO_LOC("\tconsumerd32 cmd unix sock path:%s", config->consumerd32_cmd_unix_sock_path.value ? : "Unknown"); + DBG_NO_LOC("\tconsumerd64 path: %s", config->consumerd64_path.value ? : "Unknown"); + DBG_NO_LOC("\tconsumerd64 bin path: %s", config->consumerd64_bin_path.value ? : "Unknown"); + DBG_NO_LOC("\tconsumerd64 lib dir: %s", config->consumerd64_lib_dir.value ? : "Unknown"); + DBG_NO_LOC("\tconsumerd64 err unix sock path:%s", config->consumerd64_err_unix_sock_path.value ? : "Unknown"); + DBG_NO_LOC("\tconsumerd64 cmd unix sock path:%s", config->consumerd64_cmd_unix_sock_path.value ? : "Unknown"); + DBG_NO_LOC("\tkconsumerd path: %s", config->kconsumerd_path.value ? : "Unknown"); + DBG_NO_LOC("\tkconsumerd err unix sock path: %s", config->kconsumerd_err_unix_sock_path.value ? : "Unknown"); + DBG_NO_LOC("\tkconsumerd cmd unix sock path: %s", config->kconsumerd_cmd_unix_sock_path.value ? : "Unknown"); }