/*
* Read and write the citadel.config file
*
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2016 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
#include <stdio.h>
#include <sys/utsname.h>
#include <libcitadel.h>
+#include <assert.h>
#include "config.h"
#include "ctdl_module.h"
int key_len = strlen(key);
int value_len = strlen(value);
- /* FIXME we are noisy logging for now */
- syslog(LOG_DEBUG, "\033[31mSET CONFIG: '%s' = '%s'\033[0m", key, value);
-
/* Save it in memory */
Put(ctdlconfig, key, key_len, strdup(value), NULL);
}
+
+/*
+ * Delete a system config value.
+ */
+void CtdlDelConfig(char *key)
+{
+ int key_len = strlen(key);
+
+ if (IsEmptyStr(key)) return;
+
+ /* Delete from the database. */
+ cdb_delete(CDB_CONFIG, key, key_len);
+
+ /* Delete from the in-memory cache */
+ HashPos *Pos = GetNewHashPos(ctdlconfig, 1);
+ if (GetHashPosFromKey(ctdlconfig, key, key_len, Pos)) {
+ DeleteEntryFromHash(ctdlconfig, Pos);
+ }
+ DeleteHashPos(&Pos);
+
+ assert(Pos == NULL); // no memory leaks allowed
+}
+
+
+
+
/*
* Fetch a system config value. Caller does *not* own the returned value and may not alter it.
*/
if (IsEmptyStr(key)) return(NULL);
- /* Temporary hack to make sure we didn't mess up any porting - FIXME remove this after testing thoroughly */
- if (!strncmp(key, "config", 6)) {
- syslog(LOG_EMERG, "You requested a key starting with 'config' which probably means a porting error: %s", key);
- abort();
- }
-
/* First look in memory */
if (GetHash(ctdlconfig, key, key_len, (void *)&value))
{
- if (strcmp(key, "c_min_workers")) syslog(LOG_DEBUG, "\033[32mGET CONFIG: '%s' = '%s'\033[0m", key, value);
return value;
}
cdb = cdb_fetch(CDB_CONFIG, key, key_len);
if (cdb == NULL) { /* nope, not there either. */
- syslog(LOG_DEBUG, "\033[32mGET CONFIG: '%s' = NULL\033[0m", key);
return(NULL);
}
value = strdup(cdb->ptr + key_len + 1); /* The key was stored there too; skip past it */
cdb_free(cdb);
Put(ctdlconfig, key, key_len, value, NULL);
- syslog(LOG_DEBUG, "\033[32mGET CONFIG: '%s' = '%s'\033[0m", key, value);
return value;
}
/*
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2016 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
long CtdlGetConfigLong(char *);
void CtdlSetConfigInt(char *key, int value);
void CtdlSetConfigLong(char *key, long value);
+void CtdlDelConfig(char *key);
char *CtdlGetSysConfig(char *sysconfname);
void CtdlPutSysConfig(char *sysconfname, char *sysconfdata);
/*
* This is a data store backend for the Citadel server which uses Berkeley DB.
*
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2016 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 3.
dbenv->set_paniccall(dbenv, dbpanic);
dbenv->set_errcall(dbenv, cdb_verbose_err);
dbenv->set_errpfx(dbenv, "ctdl");
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)
+#if (DB_VERSION_MAJOR > 4) || ( (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3) )
dbenv->set_msgcall(dbenv, cdb_verbose_log);
#endif
dbenv->set_verbose(dbenv, DB_VERB_DEADLOCK, 1);
/*
* citserver's main() function lives here.
*
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2016 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
syslog(LOG_NOTICE,
"*** Citadel server engine v%d.%02d (build %s) ***",
(REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
- syslog(LOG_NOTICE, "Copyright (C) 1987-2015 by the Citadel development team.");
+ syslog(LOG_NOTICE, "Copyright (C) 1987-2016 by the Citadel development team.");
syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
"General Public License.");
syslog(LOG_NOTICE, " ");