ldap/servers
by Mark Reynolds
ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 4 ++--
ldap/servers/slapd/back-ldbm/start.c | 13 +++++--------
2 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit 0ad289c99e8a5595117c53514e2f79bc71bafb84
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Nov 1 11:57:52 2016 -0400
Ticket 48978 - error log refactoring error
Description: Fix refectoring errors
https://fedorahosted.org/389/ticket/48978
Reviewed by: mreynolds(oneline commit rule)
diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
index 6b8db10..f9de439 100644
--- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
+++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
@@ -1599,9 +1599,9 @@ ldbm_back_ldbm2ldif( Slapi_PBlock *pb )
"%s: Processed %d entries (100%%).",
inst->inst_name, cnt);
}
- slapi_log_err(SLAPI_LOG_INFO,
+ slapi_log_err(SLAPI_LOG_INFO, "ldbm_back_ldbm2ldif",
"export %s: Processed %d entries (100%%).\n",
- inst->inst_name, cnt, 0);
+ inst->inst_name, cnt);
}
bye:
if (idl) {
diff --git a/ldap/servers/slapd/back-ldbm/start.c b/ldap/servers/slapd/back-ldbm/start.c
index 9765779..836e67f 100644
--- a/ldap/servers/slapd/back-ldbm/start.c
+++ b/ldap/servers/slapd/back-ldbm/start.c
@@ -150,10 +150,9 @@ ldbm_back_start( Slapi_PBlock *pb )
cache_size = (PRUint64)cache_get_max_size(&(inst->inst_cache));
db_size = dblayer_get_id2entry_size(inst);
if (cache_size < db_size) {
- slapi_log_err(SLAPI_LOG_NOTICE,
- "ldbm_back_start - "
- "%s: entry cache size %llu B is "
- "less than db size %llu B; "
+ slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start",
+ "%s: entry cache size %lu B is "
+ "less than db size %lu B; "
"We recommend to increase the entry cache size "
"nsslapd-cachememsize.\n",
inst->inst_name, cache_size, db_size);
@@ -267,10 +266,8 @@ ldbm_back_start( Slapi_PBlock *pb )
"It is highly likely your memory configuration of all backends will EXCEED your systems memory.\n");
slapi_log_err(SLAPI_LOG_CRIT, "ldbm_back_start",
"In a future release this WILL prevent server start up. You MUST alter your configuration.\n");
- slapi_log_err(SLAPI_LOG_CRIT,
- "ldbm_back_start", "Total entry cache size: %lu B; "
- "dbcache size: %lu B; "
- "available memory size: %lu B; \n",
+ slapi_log_err(SLAPI_LOG_CRIT, "ldbm_back_start", "Total entry cache size: %lu B; "
+ "dbcache size: %lu B; available memory size: %lu B; \n",
#ifdef LINUX
(PRUint64)total_cache_size, (PRUint64)li->li_dbcachesize, availpages * pagesize
#else
7 years, 5 months
- 1
- 0