Since overrides can be partial (name only, etc.) always assign a base
value from the configuration being loaded then apply overrides.
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ control_uri = output.control_uri;
+ data_uri = output.data_uri;
+ path = output.path;
+
if (overrides) {
if (overrides->path_url) {
if (overrides) {
if (overrides->path_url) {
- /* Control/data_uri are null */
path = overrides->path_url;
path = overrides->path_url;
+ /* Control/data_uri are null */
+ control_uri = NULL;
+ data_uri = NULL;
} else {
if (overrides->ctrl_url) {
} else {
if (overrides->ctrl_url) {
control_uri = overrides->ctrl_url;
control_uri = overrides->ctrl_url;
+ /* path is null */
+ path = NULL;
}
if (overrides->data_url) {
}
if (overrides->data_url) {
data_uri = overrides->data_url;
data_uri = overrides->data_url;
+ /* path is null */
+ path = NULL;
- } else {
- control_uri = output.control_uri;
- data_uri = output.data_uri;
- path = output.path;
}
snapshot_output = lttng_snapshot_output_create();
}
snapshot_output = lttng_snapshot_output_create();
+ control_uri = output.control_uri;
+ data_uri = output.data_uri;
+ path = output.path;
+
/* Check for override and apply them */
if (overrides) {
if (overrides->path_url) {
/* Check for override and apply them */
if (overrides) {
if (overrides->path_url) {
- /* control/data_uri are null */;
path = overrides->path_url;
path = overrides->path_url;
+ /* control/data_uri are null */;
+ control_uri = NULL;
+ data_uri = NULL;
} else {
if (overrides->ctrl_url) {
} else {
if (overrides->ctrl_url) {
control_uri = overrides->ctrl_url;
control_uri = overrides->ctrl_url;
+ /* path is null */
+ path = NULL;
}
if (overrides->data_url) {
}
if (overrides->data_url) {
data_uri = overrides->data_url;
data_uri = overrides->data_url;
+ /* path is null */
+ path = NULL;
- } else {
- control_uri = output.control_uri;
- data_uri = output.data_uri;
- path = output.path;
if (live_timer_interval != UINT64_MAX && !control_uri && !data_uri) {
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
goto end;
if (live_timer_interval != UINT64_MAX && !control_uri && !data_uri) {
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
goto end;