X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-conf.c;h=864f6b5d161ebbbe538321c058cbd752e047336f;hb=46c27e2883a78388c895dc883dbb9b902fc8350d;hp=bbe26a1470f91cde0ce631312225c93f551d86f9;hpb=0f4971d043c38bae1bfb95201622a1405110f899;p=onak.git

diff --git a/onak-conf.c b/onak-conf.c
index bbe26a1..864f6b5 100644
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: onak-conf.c,v 1.7 2003/06/04 20:57:11 noodles Exp $
+ * $Id: onak-conf.c,v 1.9 2004/05/27 01:34:18 noodles Exp $
  */
 
 #include <ctype.h>
@@ -45,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);
 
@@ -110,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) ||