The title of this patch has an extra comma. On 18 May 2018 at 17:16, Jonathan Rajotte < jonathan.rajotte-jul...@efficios.com> wrote:
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-jul...@efficios.com> > --- > src/bin/lttng-sessiond/sessiond-config.c | 49 +++++++++++++++--------- > 1 file changed, 31 insertions(+), 18 deletions(-) > > diff --git a/src/bin/lttng-sessiond/sessiond-config.c > b/src/bin/lttng-sessiond/sessiond-config.c > index 587f2f82..c0e0fec3 100644 > --- a/src/bin/lttng-sessiond/sessiond-config.c > +++ b/src/bin/lttng-sessiond/sessiond-config.c > @@ -501,22 +501,35 @@ void sessiond_config_log(struct sessiond_config > *config) > 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("\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); > + DBG_NO_LOC("\tconsumerd32 bin_path: %s", > config->consumerd32_bin_path.value); > + DBG_NO_LOC("\tconsumerd32 lib dir: %s", > config->consumerd32_lib_dir.value); > + DBG_NO_LOC("\tconsumerd32 err unix sock path:%s", > config->consumerd32_err_unix_sock_path.value); > + DBG_NO_LOC("\tconsumerd32 cmd unix sock path:%s", > config->consumerd32_cmd_unix_sock_path.value); > + DBG_NO_LOC("\tconsumerd64 path: %s", > config->consumerd64_path.value); > + DBG_NO_LOC("\tconsumerd64 bin path: %s", > config->consumerd64_bin_path.value); > + DBG_NO_LOC("\tconsumerd64 lib dir: %s", > config->consumerd64_lib_dir.value); > + DBG_NO_LOC("\tconsumerd64 err unix sock path:%s", > config->consumerd64_err_unix_sock_path.value); > + DBG_NO_LOC("\tconsumerd64 cmd unix sock path:%s", > config->consumerd64_cmd_unix_sock_path.value); > + DBG_NO_LOC("\tkconsumerd path: %s", > config->kconsumerd_path.value); > + DBG_NO_LOC("\tkconsumerd err unix sock path: %s", > config->kconsumerd_err_unix_sock_path.value); > + DBG_NO_LOC("\tkconsumerd cmd unix sock path: %s", > config->kconsumerd_cmd_unix_sock_path.value); > Those string values can be NULL. Look at how this is handled for the existing string options (ternary + place holder). In this case, using "Unknown" seems appropriate. Thanks, Jérémie > } > -- > 2.17.0 > > -- Jérémie Galarneau EfficiOS Inc. http://www.efficios.com
_______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev