X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flockidx.c;h=91b5ddb0ac84980a3548e5e5fb43dbc050623e0d;hb=af7bc27d33843a8e667022f24589450c39f907f2;hp=eb833b255f4821ede18348e2f84bf623545b95f2;hpb=7e3b091d6944a2ef10f1c6e983181be53b565e34;p=idzebra-moved-to-github.git

diff --git a/index/lockidx.c b/index/lockidx.c
index eb833b2..91b5ddb 100644
--- a/index/lockidx.c
+++ b/index/lockidx.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lockidx.c,v $
- * Revision 1.4  1995-12-12 16:00:57  adam
+ * Revision 1.7  1996-10-29 14:08:13  adam
+ * Uses resource lockDir instead of lockPath.
+ *
+ * Revision 1.6  1996/03/26 16:01:13  adam
+ * New setting lockPath: directory of various lock files.
+ *
+ * Revision 1.5  1995/12/13  08:46:09  adam
+ * Locking uses F_WRLCK and F_RDLCK again!
+ *
+ * Revision 1.4  1995/12/12  16:00:57  adam
  * System call sync(2) used after update/commit.
  * Locking (based on fcntl) uses F_EXLCK and F_SHLCK instead of F_WRLCK
  * and F_RDLCK.
@@ -30,7 +39,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include <alexutil.h>
 #include "index.h"
 
 static int lock_fd = -1;
@@ -47,7 +55,7 @@ int zebraIndexWait (int commitPhase)
 
     if (server_lock_cmt == -1)
     {
-        sprintf (path, "%s%s", FNAME_COMMIT_LOCK, pathPrefix);
+        sprintf (path, "%s%s", pathPrefix, FNAME_COMMIT_LOCK);
         if ((server_lock_cmt = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
             == -1)
         {
@@ -59,7 +67,7 @@ int zebraIndexWait (int commitPhase)
         zebraUnlock (server_lock_cmt);
     if (server_lock_org == -1)
     {
-        sprintf (path, "%s%s", FNAME_ORG_LOCK, pathPrefix);
+        sprintf (path, "%s%s", pathPrefix, FNAME_ORG_LOCK);
         if ((server_lock_org = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
             == -1)
         {
@@ -142,7 +150,7 @@ void zebraIndexLock (int commitNow)
         lock_fd = open (path, O_CREAT|O_RDWR|O_EXCL, 0666);
         if (lock_fd == -1)
         {
-            lock_fd = open (path, O_RDONLY);
+            lock_fd = open (path, O_RDWR);
             if (lock_fd == -1) 
             {
                 if (errno == ENOENT)
@@ -150,12 +158,15 @@ void zebraIndexLock (int commitNow)
                 logf (LOG_FATAL|LOG_ERRNO, "open %s", path);
                 exit (1);
             }
+            logf (LOG_LOG, "zebraLockNB");
             if (zebraLockNB (lock_fd, 1) == -1)
             {
                 if (errno == EWOULDBLOCK)
                 {
                     logf (LOG_LOG, "Waiting for other index process");
                     zebraLock (lock_fd, 1);
+                    zebraUnlock (lock_fd);
+                    close (lock_fd);
                     continue;
                 }
                 else
@@ -177,7 +188,7 @@ void zebraIndexLock (int commitNow)
                 }
                 else if (r == -1)
                 {
-                    logf (LOG_FATAL|LOG_ERRNO, "read  %s", path);
+                    logf (LOG_FATAL|LOG_ERRNO, "read %s", path);
                     exit (1);
                 }
                 if (*buf == 'r')