From 62feec3227746dbb4d68d9b125481c11fd53786f Mon Sep 17 00:00:00 2001
From: Cyril Jaquier <cyril.jaquier@fail2ban.org>
Date: Wed, 30 Mar 2005 22:48:38 +0000
Subject: [PATCH] - Improved verbose mode

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@95 a942ae1a-1317-0410-a47c-b1dcaea8d605
---
 CHANGELOG   |  1 +
 README      |  2 +-
 fail2ban.py | 14 +++++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a8abaac6..86e83aaf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ ver. 0.3.1 (??/??/2005) - beta
 - Corrected level of messages
 - Added DNS lookup support
 - Improved parsing speed. Only parse the new log messages
+- Added a second verbose level (-vv)
 
 ver. 0.3.0 (02/24/2005) - beta
 ----------
diff --git a/README b/README
index a201b81f..658d900b 100644
--- a/README
+++ b/README
@@ -94,7 +94,7 @@ options:
   -l <FILE>  log message in FILE
   -r <VALUE> allow a max of VALUE password failure
   -t <TIME>  ban IP for TIME seconds
-  -v         verbose
+  -v         verbose. Use twice for greater effect
   -w <FIWA>  select the firewall to use. Can be iptables,
              ipfwadm or ipfw
 
diff --git a/fail2ban.py b/fail2ban.py
index 22587391..d7ee42df 100755
--- a/fail2ban.py
+++ b/fail2ban.py
@@ -63,7 +63,7 @@ def usage():
 	print "  -l <FILE>  log message in FILE"
 	print "  -r <VALUE> allow a max of VALUE password failure"
 	print "  -t <TIME>  ban IP for TIME seconds"
-	print "  -v         verbose"
+	print "  -v         verbose. Use twice for greater effect"
 	print "  -w <FIWA>  select the firewall to use. Can be iptables,"
 	print "             ipfwadm or ipfw"
 	print
@@ -212,7 +212,7 @@ if __name__ == "__main__":
 	logSys.set_formatstring("%T %L %M")
 	
 	conf = dict()
-	conf["verbose"] = False
+	conf["verbose"] = 0
 	conf["background"] = False
 	conf["debug"] = False
 	conf["conffile"] = "/etc/fail2ban.conf"
@@ -357,7 +357,7 @@ if __name__ == "__main__":
 		if opt[0] == "-h":
 			usage()
 		if opt[0] == "-v":
-			conf["verbose"] = True
+			conf["verbose"] = conf["verbose"] + 1
 		if opt[0] == "-b":
 			conf["background"] = True
 		if opt[0] == "-d":
@@ -393,8 +393,12 @@ if __name__ == "__main__":
 
 	# Process some options
 	for c in conf:
-		if c == "verbose" and conf[c]:
-			logSys.set_loglevel(log4py.LOGLEVEL_VERBOSE)
+		if c == "verbose":
+			logSys.warn("Verbose level is "+`conf[c]`)
+			if conf[c] == 1:
+				logSys.set_loglevel(log4py.LOGLEVEL_VERBOSE)
+			elif conf[c] > 1:
+				logSys.set_loglevel(log4py.LOGLEVEL_DEBUG)
 		elif c == "debug" and conf[c]:
 			logSys.set_loglevel(log4py.LOGLEVEL_DEBUG)
 			logSys.set_formatstring(log4py.FMT_DEBUG)