X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flocksrv.c;h=f8d712d48043cdd7cc9b9f8639e72f6abb29448c;hb=af7bc27d33843a8e667022f24589450c39f907f2;hp=0e391fadbe6711a74c6ecb4e658480a1bcbf21bc;hpb=4495fac3b7f760814dd3b41d0f64e5077193eeee;p=idzebra-moved-to-github.git

diff --git a/index/locksrv.c b/index/locksrv.c
index 0e391fa..f8d712d 100644
--- a/index/locksrv.c
+++ b/index/locksrv.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1996, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: locksrv.c,v $
- * Revision 1.3  1995-12-11 11:43:29  adam
+ * Revision 1.6  1996-10-29 14:06:52  adam
+ * Include zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.5  1996/05/15 11:58:18  adam
+ * Changed some log messages.
+ *
+ * Revision 1.4  1996/04/10  16:01:27  quinn
+ * Fixed order of path/filename.
+ *
+ * Revision 1.3  1995/12/11  11:43:29  adam
  * Locking based on fcntl instead of flock.
  * Setting commitEnable removed. Command line option -n can be used to
  * prevent commit if commit setting is defined in the configuration file.
@@ -26,7 +35,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include <alexutil.h>
 #include "zserver.h"
 
 static int server_lock_cmt = -1;
@@ -41,7 +49,7 @@ int zebraServerLock (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, 0666))
             == -1)
         {
@@ -50,7 +58,7 @@ int zebraServerLock (int commitPhase)
         }
         assert (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, 0666))
             == -1)
         {
@@ -60,12 +68,12 @@ int zebraServerLock (int commitPhase)
     }
     if (commitPhase)
     {
-        logf (LOG_LOG, "Server locks org");
+        logf (LOG_DEBUG, "Server locks org");
         zebraLock (server_lock_org, 0);
     }
     else
     {
-        logf (LOG_LOG, "Server locks cmt");
+        logf (LOG_DEBUG, "Server locks cmt");
         zebraLock (server_lock_cmt, 0);
     }
     return 0;
@@ -77,12 +85,12 @@ void zebraServerUnlock (int commitPhase)
         return;
     if (commitPhase)
     {
-        logf (LOG_LOG, "Server unlocks org");
+        logf (LOG_DEBUG, "Server unlocks org");
         zebraUnlock (server_lock_org);
     }
     else
     {
-        logf (LOG_LOG, "Server unlocks cmt");
+        logf (LOG_DEBUG, "Server unlocks cmt");
         zebraUnlock (server_lock_cmt);
     }
 }