projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: loading a session prints an error message but the load is successful
[lttng-tools.git]
/
src
/
common
/
config
/
session-config.c
diff --git
a/src/common/config/session-config.c
b/src/common/config/session-config.c
index 743b5143893a4364cf5bf4f314e408102f77824d..01b6d9c0e65066ae3fcfba47697fad748d88a3f0 100644
(file)
--- a/
src/common/config/session-config.c
+++ b/
src/common/config/session-config.c
@@
-26,6
+26,7
@@
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <stdbool.h>
#include <common/defaults.h>
#include <common/error.h>
#include <common/defaults.h>
#include <common/error.h>
@@
-2837,8
+2838,8
@@
end:
}
}
}
}
- if (
!
session_found) {
- ret =
-LTTNG_ERR_LOAD_SESSION_NOENT
;
+ if (session_found) {
+ ret =
0
;
}
return ret;
}
return ret;
@@
-2883,6
+2884,7
@@
int config_load_session(const char *path, const char *session_name,
int override, unsigned int autoload)
{
int ret;
int override, unsigned int autoload)
{
int ret;
+ bool session_loaded = false;
const char *path_ptr = NULL;
struct session_config_validation_ctx validation_ctx = { 0 };
const char *path_ptr = NULL;
struct session_config_validation_ctx validation_ctx = { 0 };
@@
-2941,6
+2943,7
@@
int config_load_session(const char *path, const char *session_name,
* Continue even if the session was found since we have to try
* the system wide sessions.
*/
* Continue even if the session was found since we have to try
* the system wide sessions.
*/
+ session_loaded = true;
}
}
}
}
@@
-2963,6
+2966,9
@@
int config_load_session(const char *path, const char *session_name,
if (path_ptr) {
ret = load_session_from_path(path_ptr, session_name,
&validation_ctx, override);
if (path_ptr) {
ret = load_session_from_path(path_ptr, session_name,
&validation_ctx, override);
+ if (!ret) {
+ session_loaded = true;
+ }
}
} else {
ret = access(path, F_OK);
}
} else {
ret = access(path, F_OK);
@@
-2995,5
+3001,10
@@
end:
*/
ret = 0;
}
*/
ret = 0;
}
+
+ if (session_loaded && ret == -LTTNG_ERR_LOAD_SESSION_NOENT) {
+ /* A matching session was found in one of the search paths. */
+ ret = 0;
+ }
return ret;
}
return ret;
}
This page took
0.025241 seconds
and
4
git commands to generate.