Verbose Level verschärft

git-svn-id: http://svn.brehm-online.com/svn/my-stuff/nagios/trunk@155 ec8d2aa5-1599-4edb-8739-2b3a1bc399aa

diff --git a/bin/nagios/cfg/struct.py b/bin/nagios/cfg/struct.py
index a43ebce560208c2a58a9eaca4493d87a2b440b5f..2053a208721fcdf9bebf7f2ff95f3ce657173079 100755 (executable)
--- a/bin/nagios/cfg/struct.py
+++ b/bin/nagios/cfg/struct.py
@@ -454,7 +454,7 @@ returns None on failure"""
             if match is not None:
                 return None
 
-        if self.verbose >= 3:
+        if self.verbose >= 4:
             self.logger.debug( "Inspecting timeperiod line:\n\t{0!r}".format( line ) )
 
         re_time         = r'(?:(?:(?:[01][0-9]|2[0-3]):[0-5][0-9])|24:00)'
@@ -469,12 +469,12 @@ returns None on failure"""
 
         # first search for a simple weekday
         regex = r'^' + re_weekdays + r'\s+' + re_timeranges + r'$'
-        if self.verbose >= 4:
+        if self.verbose >= 5:
             self.logger.debug( "Timeperiod Regex {0!r}.\n\t{1!r}".format( regex, line ) )
         match = re.search( regex, line )
         if match is not None:
 
-            if self.verbose >= 3:
+            if self.verbose >= 4:
                 liste = []
                 for k in match.groups():
                     liste.append(k)
@@ -491,12 +491,12 @@ returns None on failure"""
         regex = r'^' + re_isodate + r'(?:\s*-\s*' + re_isodate + r')?(?:\s*/\s*(\d+))?\s+' + re_timeranges + r'$'
         #                1 2 3                        4 5 6                      7              8 ...
 
-        if self.verbose >= 4:
+        if self.verbose >= 5:
             self.logger.debug( "Timeperiod Regex {0!r}.\n\t{1!r}".format( regex, line ) )
         match = re.search( regex, line )
         if match is not None:
 
-            if self.verbose >= 3:
+            if self.verbose >= 4:
                 liste = []
                 for k in match.groups():
                     liste.append(k)
@@ -546,12 +546,12 @@ returns None on failure"""
         #                                   4               5                  6
         regex += r'(?:\s*/\s*(\d+))?\s+' + re_timeranges + r'$'
         #                            7               8...
-        if self.verbose >= 4:
+        if self.verbose >= 5:
             self.logger.debug( "Timeperiod Regex {0!r}.\n\t{1!r}".format( regex, line ) )
         match = re.search( regex, line )
         if match is not None:
 
-            if self.verbose >= 3:
+            if self.verbose >= 4:
                 liste = []
                 for k in match.groups():
                     liste.append(k)
@@ -578,12 +578,12 @@ returns None on failure"""
         #                     1                  2                      3
         regex += r'(?:\s*/\s*(\d+))?\s+' + re_timeranges + r'$'
         #                      4                5...
-        if self.verbose >= 4:
+        if self.verbose >= 5:
             self.logger.debug( "Timeperiod Regex {0!r}.\n\t{1!r}".format( regex, line ) )
         match = re.search( regex, line )
         if match is not None:
 
-            if self.verbose >= 3:
+            if self.verbose >= 4:
                 liste = []
                 for k in match.groups():
                     liste.append(k)
@@ -606,12 +606,12 @@ returns None on failure"""
         #                    1                   2                     3                  4
         regex += r'(?:\s*/\s*(\d+))?\s+' + re_timeranges + r'$'
         #                      5                 6 ...
-        if self.verbose >= 4:
+        if self.verbose >= 5:
             self.logger.debug( "Timeperiod Regex {0!r}.\n\t{1!r}".format( regex, line ) )
         match = re.search( regex, line )
         if match is not None:
 
-            if self.verbose >= 3:
+            if self.verbose >= 4:
                 liste = []
                 for k in match.groups():
                     liste.append(k)