X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/0f4971d043c38bae1bfb95201622a1405110f899..5976b6484c1db0724cf87303c5ddd66e66e725a8:/onak-conf.c?ds=sidebyside diff --git a/onak-conf.c b/onak-conf.c index bbe26a1..8719235 100644 --- a/onak-conf.c +++ b/onak-conf.c @@ -4,8 +4,6 @@ * Jonathan McDowell * * Copyright 2002 Project Purple - * - * $Id: onak-conf.c,v 1.7 2003/06/04 20:57:11 noodles Exp $ */ #include @@ -45,13 +43,17 @@ struct onak_config config = { NULL, /* pg_dbpass */ }; -void readconfig(void) { +void readconfig(const char *configfile) { 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); @@ -110,6 +112,8 @@ void readconfig(void) { 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) ||