projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug #249: rstemp sets fail. Problem was that rset files were
[idzebra-moved-to-github.git]
/
index
/
locksrv.c
diff --git
a/index/locksrv.c
b/index/locksrv.c
index
ac79e27
..
98f4b22
100644
(file)
--- a/
index/locksrv.c
+++ b/
index/locksrv.c
@@
-1,6
+1,6
@@
-/* $Id: locksrv.c,v 1.17 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: locksrv.c,v 1.19 2005-01-15 19:38:26 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-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);
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;
}
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);
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;
}
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)))
{
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);
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)))
{
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)
{
return -1;
}
}
if (commitPhase)
{
- logf (LOG_DEBUG, "Server locks org");
+ yaz_log (YLOG_DEBUG, "Server locks org");
zebra_lock (zi->server_lock_org);
}
else
{
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;
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;
{
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);
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);
}
zebra_unlock (zi->server_lock_cmt);
}