X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flockidx.c;h=cd2583fd470ee96e7d24bb445e0d4d7e90b799c6;hb=4415da5dbbba04e50d4524347486d60113ed569c;hp=30bc6d0d32b7b48bef77e4b368e6032fe3f33b87;hpb=e583a127856d4f363ff2ba7b4321bcc8c048edba;p=idzebra-moved-to-github.git

diff --git a/index/lockidx.c b/index/lockidx.c
index 30bc6d0..cd2583f 100644
--- a/index/lockidx.c
+++ b/index/lockidx.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lockidx.c,v $
- * Revision 1.13  1997-09-29 09:08:36  adam
+ * Revision 1.16  1999-02-02 14:50:57  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.15  1998/02/17 10:31:33  adam
+ * Fixed bug in zebraIndexUnlock. On NT, the lock files wasn't removed.
+ *
+ * Revision 1.14  1998/01/12 15:04:08  adam
+ * The test option (-s) only uses read-lock (and not write lock).
+ *
+ * Revision 1.13  1997/09/29 09:08:36  adam
  * Revised locking system to be thread safe for the server.
  *
  * Revision 1.12  1997/09/25 14:54:43  adam
@@ -55,7 +64,7 @@
  */
 #include <stdio.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -110,7 +119,7 @@ int zebraIndexWait (int commitPhase)
         h = server_lock_org;
     if (zebra_lock_nb (h))
     {
-#ifndef WINDOWS
+#ifndef WIN32
         if (errno != EWOULDBLOCK)
         {
             logf (LOG_FATAL|LOG_ERRNO, "flock");
@@ -157,9 +166,11 @@ void zebraIndexUnlock (void)
 {
     char path[1024];
     
+    zebra_lock_destroy (server_lock_main);
     zebra_lock_prefix (common_resource, path);
     strcat (path, FNAME_MAIN_LOCK);
-    unlink (path);
+    if (unlink (path))
+        logf (LOG_WARN|LOG_ERRNO, "unlink %s", path);
 }
 
 void zebraIndexLock (BFiles bfs, int commitNow, const char *rval)
@@ -188,7 +199,7 @@ void zebraIndexLock (BFiles bfs, int commitNow, const char *rval)
             }
             if (zebra_lock_nb (server_lock_main) == -1)
             {
-#ifdef WINDOWS
+#ifdef WIN32
                 logf (LOG_LOG, "waiting for other index process");
                 zebra_lock (server_lock_main);
                 zebra_unlock (server_lock_main);
@@ -247,7 +258,12 @@ void zebraIndexLock (BFiles bfs, int commitNow, const char *rval)
                 }                    
                 else if (*buf == 'w')
                 {
-                    logf (LOG_WARN, "your index may be inconsistent");
+		    logf (LOG_WARN,
+			  "The lock file indicates that your index is");
+		    logf (LOG_WARN, "inconsistent. Perhaps the indexer");
+		    logf (LOG_WARN, "terminated abnormally in the previous");
+		    logf (LOG_WARN, "run. You can try to proceed by");
+		    logf (LOG_WARN, "deleting the file %s", path);
                     exit (1);
                 }
                 else if (*buf == 'c')