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
Charmap work
[idzebra-moved-to-github.git]
/
index
/
locksrv.c
diff --git
a/index/locksrv.c
b/index/locksrv.c
index
0e391fa
..
903334e
100644
(file)
--- a/
index/locksrv.c
+++ b/
index/locksrv.c
@@
-1,10
+1,16
@@
/*
/*
- * 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 $
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: locksrv.c,v $
- * Revision 1.3 1995-12-11 11:43:29 adam
+ * 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.
* 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.
@@
-41,7
+47,7
@@
int zebraServerLock (int commitPhase)
if (server_lock_cmt == -1)
{
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)
{
if ((server_lock_cmt = open (path, O_CREAT|O_RDWR, 0666))
== -1)
{
@@
-50,7
+56,7
@@
int zebraServerLock (int commitPhase)
}
assert (server_lock_org == -1);
}
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)
{
if ((server_lock_org = open (path, O_CREAT|O_RDWR, 0666))
== -1)
{
@@
-60,12
+66,12
@@
int zebraServerLock (int commitPhase)
}
if (commitPhase)
{
}
if (commitPhase)
{
- logf (LOG_LOG, "Server locks org");
+ logf (LOG_DEBUG, "Server locks org");
zebraLock (server_lock_org, 0);
}
else
{
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;
zebraLock (server_lock_cmt, 0);
}
return 0;
@@
-77,12
+83,12
@@
void zebraServerUnlock (int commitPhase)
return;
if (commitPhase)
{
return;
if (commitPhase)
{
- logf (LOG_LOG, "Server unlocks org");
+ logf (LOG_DEBUG, "Server unlocks org");
zebraUnlock (server_lock_org);
}
else
{
zebraUnlock (server_lock_org);
}
else
{
- logf (LOG_LOG, "Server unlocks cmt");
+ logf (LOG_DEBUG, "Server unlocks cmt");
zebraUnlock (server_lock_cmt);
}
}
zebraUnlock (server_lock_cmt);
}
}