X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/3b5b9db0bc2dbe93b3b79e722997606c71ecafb9..cd4738e8f5ede42cba925b58a84c61e22bab8e8f:/onak-conf.c?ds=sidebyside diff --git a/onak-conf.c b/onak-conf.c index f215b31..81d7bdf 100644 --- a/onak-conf.c +++ b/onak-conf.c @@ -6,6 +6,8 @@ * Copyright 2002 Project Purple */ +#include "config.h" + #include #include #include @@ -43,13 +45,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); @@ -108,6 +114,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) ||