projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: lock file already taken is error, not warning
[lttng-tools.git]
/
src
/
common
/
utils.c
diff --git
a/src/common/utils.c
b/src/common/utils.c
index 365510b3c37de51bacdeafee888b7f87e9776ac5..7f91dcb8151ea6ae6083668e78df123f73521758 100644
(file)
--- a/
src/common/utils.c
+++ b/
src/common/utils.c
@@
-477,10
+477,14
@@
int utils_create_pid_file(pid_t pid, const char *filepath)
ret = fprintf(fp, "%d\n", pid);
if (ret < 0) {
PERROR("fprintf pid file");
ret = fprintf(fp, "%d\n", pid);
if (ret < 0) {
PERROR("fprintf pid file");
+ goto error;
}
}
- fclose(fp);
+ if (fclose(fp)) {
+ PERROR("fclose");
+ }
DBG("Pid %d written in file %s", pid, filepath);
DBG("Pid %d written in file %s", pid, filepath);
+ ret = 0;
error:
return ret;
}
error:
return ret;
}
@@
-512,9
+516,11
@@
int utils_create_lock_file(const char *filepath)
*/
ret = flock(fd, LOCK_EX | LOCK_NB);
if (ret) {
*/
ret = flock(fd, LOCK_EX | LOCK_NB);
if (ret) {
-
WARN
("Could not get lock file %s, another instance is running.",
+
ERR
("Could not get lock file %s, another instance is running.",
filepath);
filepath);
- close(fd);
+ if (close(fd)) {
+ PERROR("close lock file");
+ }
fd = ret;
goto error;
}
fd = ret;
goto error;
}
This page took
0.024262 seconds
and
4
git commands to generate.