X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flocksrv.c;fp=index%2Flocksrv.c;h=ee69806d3979e84a8e71584e25996fb1555dc420;hb=5437b50633032595afe6f87dc0f989bc92a5aea8;hp=ac79e273a8818bc63bda2b74599c0ab9e5861f13;hpb=1c948d94056d5eb4e55ef3192a360514d7946669;p=idzebra-moved-to-github.git

diff --git a/index/locksrv.c b/index/locksrv.c
index ac79e27..ee69806 100644
--- a/index/locksrv.c
+++ b/index/locksrv.c
@@ -1,4 +1,4 @@
-/* $Id: locksrv.c,v 1.17 2002-08-02 19:26:55 adam Exp $
+/* $Id: locksrv.c,v 1.18 2004-11-19 10:26:58 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -46,7 +46,7 @@ int zebra_server_lock_init (ZebraService zi)
     zi->server_path_prefix = (char *) xmalloc (strlen(path_prefix)+1);
     strcpy (zi->server_path_prefix, path_prefix);
 
-    logf (LOG_DEBUG, "Locking system initialized");
+    yaz_log (YLOG_DEBUG, "Locking system initialized");
     return 0;
 }
 
@@ -55,7 +55,7 @@ int zebra_server_lock_destroy (ZebraService zi)
     xfree (zi->server_path_prefix);
     zebra_lock_destroy (zi->server_lock_cmt);
     zebra_lock_destroy (zi->server_lock_org);
-    logf (LOG_DEBUG, "Locking system destroyed");
+    yaz_log (YLOG_DEBUG, "Locking system destroyed");
     return 0;
 }
 
@@ -69,7 +69,7 @@ int zebra_server_lock (ZebraService zi, int commitPhase)
 	strcat (path, FNAME_COMMIT_LOCK);
         if (!(zi->server_lock_cmt = zebra_lock_create (path, 0)))
         {
-            logf (LOG_FATAL|LOG_ERRNO, "create %s", path);
+            yaz_log (YLOG_FATAL|YLOG_ERRNO, "create %s", path);
             return -1;
         }
         assert (zi->server_lock_org == NULL);
@@ -78,18 +78,18 @@ int zebra_server_lock (ZebraService zi, int commitPhase)
 	strcat (path, FNAME_ORG_LOCK);
         if (!(zi->server_lock_org = zebra_lock_create (path, 0)))
         {
-            logf (LOG_FATAL|LOG_ERRNO, "create %s", path);
+            yaz_log (YLOG_FATAL|YLOG_ERRNO, "create %s", path);
             return -1;
         }
     }
     if (commitPhase)
     {
-        logf (LOG_DEBUG, "Server locks org");
+        yaz_log (YLOG_DEBUG, "Server locks org");
         zebra_lock (zi->server_lock_org);
     }
     else
     {
-        logf (LOG_DEBUG, "Server locks cmt");
+        yaz_log (YLOG_DEBUG, "Server locks cmt");
         zebra_lock (zi->server_lock_cmt);
     }
     return 0;
@@ -99,9 +99,9 @@ void zebra_server_unlock (ZebraService zi, int commitPhase)
 {
     if (zi->server_lock_org == NULL)
         return;
-    logf (LOG_DEBUG, "Server unlocks org");
+    yaz_log (YLOG_DEBUG, "Server unlocks org");
     zebra_unlock (zi->server_lock_org);
-    logf (LOG_DEBUG, "Server unlocks cmt");
+    yaz_log (YLOG_DEBUG, "Server unlocks cmt");
     zebra_unlock (zi->server_lock_cmt);
 }