Mercurial > masqmail

changeset 395:5f0829f8e6c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed log_max_pri limit. It makes no sense.
author markus schnalke <meillo@marmaro.de>
date Sat, 18 Feb 2012 19:39:11 +0100 (2012-02-18)
parents c8e3d1a79313
children 6f2a8113a79e
files src/conf.c src/log.c src/masqmail.h
diffstat 3 files changed, 11 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/conf.c	Sat Feb 18 19:32:40 2012 +0100
+++ b/src/conf.c	Sat Feb 18 19:39:11 2012 +0100
@@ -396,7 +396,6 @@
 	gchar lval[256], rval[2048];
 	GList *listen_addrs_tmp = NULL;
 
-	conf.log_max_pri = 7;
 	conf.do_relay = TRUE;
 	conf.localpartcmp = strcmp;
 	conf.max_defer_time = 86400 * 4;  /* 4 days */
--- a/src/log.c	Sat Feb 18 19:32:40 2012 +0100
+++ b/src/log.c	Sat Feb 18 19:39:11 2012 +0100
@@ -125,20 +125,20 @@
 	if (!pri) {
 		return;
 	}
-	if (conf.use_syslog)
+	if (conf.use_syslog) {
 		vsyslog(pri, fmt, args);
-	else if (pri <= conf.log_max_pri) {
-		FILE *file = logfile ? logfile : stderr;
-		time_t now = time(NULL);
-		struct tm *t = localtime(&now);
-		gchar buf[24];
+		return;
+	}
+	FILE *file = logfile ? logfile : stderr;
+	time_t now = time(NULL);
+	struct tm *t = localtime(&now);
+	gchar buf[24];
 
-		strftime(buf, 24, "%Y-%m-%d %H:%M:%S", t);
-		fprintf(file, "%s [%d] ", buf, getpid());
+	strftime(buf, 24, "%Y-%m-%d %H:%M:%S", t);
+	fprintf(file, "%s [%d] ", buf, getpid());
 
-		vfprintf(file, fmt, args);
-		fflush(file);
-	}
+	vfprintf(file, fmt, args);
+	fflush(file);
 }
 
 #ifdef ENABLE_DEBUG
--- a/src/masqmail.h	Sat Feb 18 19:32:40 2012 +0100
+++ b/src/masqmail.h	Sat Feb 18 19:39:11 2012 +0100
@@ -129,7 +129,6 @@
 
 	gint debug_level;
 	gboolean use_syslog;
-	guint log_max_pri;
 
 	gchar *host_name;
 	GList *local_hosts;