Changeset: c91241036ed4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c91241036ed4
Modified Files:
tools/merovingian/daemon/merovingian.c
Branch: Jun2016
Log Message:
No need to unlock after failed locking; no need to unlink lock file.
diffs (20 lines):
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -761,8 +761,6 @@ main(int argc, char *argv[])
if (_mero_topdp->out == -1) {
Mfprintf(stderr, "unable to open '%s': %s\n",
p, strerror(errno));
- MT_lockf(".merovingian_lock", F_ULOCK, 4, 1);
- close(lockfd);
MERO_EXIT_CLEAN(1);
}
_mero_topdp->err = _mero_topdp->out;
@@ -1071,7 +1069,6 @@ shutdown:
}
/* remove files that suggest our existence */
- unlink(".merovingian_lock");
if (pidfilename != NULL) {
unlink(pidfilename);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
