projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update my key.
[onak.git]
/
onak-conf.c
diff --git
a/onak-conf.c
b/onak-conf.c
index 93a9320b4a3e165db6dbdd3e8ca1691b255d01db..81d7bdf97cc978ff2f271643a8dccb61ebf710ad 100644
(file)
--- a/
onak-conf.c
+++ b/
onak-conf.c
@@
-6,12
+6,15
@@
* Copyright 2002 Project Purple
*/
* Copyright 2002 Project Purple
*/
+#include "config.h"
+
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "ll.h"
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "ll.h"
+#include "log.h"
#include "onak-conf.h"
/*
#include "onak-conf.h"
/*
@@
-26,6
+29,7
@@
struct onak_config config = {
NULL, /* adminemail */
NULL, /* mta */
NULL, /* syncsites */
NULL, /* adminemail */
NULL, /* mta */
NULL, /* syncsites */
+ NULL, /* logfile */
/*
* Options for directory backends.
/*
* Options for directory backends.
@@
-41,13
+45,17
@@
struct onak_config config = {
NULL, /* pg_dbpass */
};
NULL, /* pg_dbpass */
};
-void readconfig(
void
) {
+void readconfig(
const char *configfile
) {
FILE *conffile;
char curline[1024];
int i;
curline[1023] = 0;
FILE *conffile;
char curline[1024];
int i;
curline[1023] = 0;
- conffile = fopen(CONFIGFILE, "r");
+ if (configfile == NULL) {
+ conffile = fopen(CONFIGFILE, "r");
+ } else {
+ conffile = fopen(configfile, "r");
+ }
if (conffile != NULL) {
fgets(curline, 1023, conffile);
if (conffile != NULL) {
fgets(curline, 1023, conffile);
@@
-104,6
+112,10
@@
void readconfig(void) {
} else if (!strncmp("syncsite ", curline, 9)) {
config.syncsites =
lladd(config.syncsites, strdup(&curline[9]));
} else if (!strncmp("syncsite ", curline, 9)) {
config.syncsites =
lladd(config.syncsites, strdup(&curline[9]));
+ } else if (!strncmp("logfile ", curline, 8)) {
+ config.logfile = strdup(&curline[8]);
+ } else if (!strncmp("loglevel ", curline, 9)) {
+ setlogthreshold(atoi(&curline[9]));
} else if (!strncmp("this_site ", curline, 10)) {
config.thissite = strdup(&curline[10]);
} else if (!strncmp("socket_name ", curline, 12) ||
} else if (!strncmp("this_site ", curline, 10)) {
config.thissite = strdup(&curline[10]);
} else if (!strncmp("socket_name ", curline, 12) ||
@@
-114,14
+126,16
@@
void readconfig(void) {
* Not applicable; ignored for compatibility with pksd.
*/
} else {
* Not applicable; ignored for compatibility with pksd.
*/
} else {
- fprintf(stderr, "Unknown config line: %s\n", curline);
+ logthing(LOGTHING_ERROR,
+ "Unknown config line: %s", curline);
}
fgets(curline, 1023, conffile);
}
fclose(conffile);
} else {
}
fgets(curline, 1023, conffile);
}
fclose(conffile);
} else {
- fprintf(stderr, "Couldn't open config file; using defaults.\n");
+ logthing(LOGTHING_NOTICE,
+ "Couldn't open config file; using defaults.");
}
}
}
}
@@
-162,4
+176,8
@@
void cleanupconfig(void) {
llfree(config.syncsites, free);
config.syncsites = NULL;
}
llfree(config.syncsites, free);
config.syncsites = NULL;
}
+ if (config.logfile != NULL) {
+ free(config.logfile);
+ config.logfile = NULL;
+ }
}
}