Changeset 667 for trunk/jobmond

Timestamp:

09/14/12 14:45:50 (12 years ago)

Author:

ramonb

Message:

jobmond.py:

• added lots of configparsing debug prints
• fix to comment parsing when /* and */ on same line
• ignore /* for lines starting with include: can be wildcard
• fix to section { and } parsing: only close section when {}count hits 0
• fix to include file parsing: should be string not list
• include line should be split, not strip

File:

• trunk/jobmond/jobmond.py (modified) (5 diffs)

trunk/jobmond/jobmond.py

@@ -91 +91 @@
     return loadConfig( config_filename )
 
-# Fixme:  This doesn't DTRT with commented-out bits of the file.  E.g.
-# it picked up a commented-out `mcast_join' and tried to use a
-# multicast channel when it shouldn't have done.
 class GangliaConfigParser:
 
@@ -140 +137 @@
     def getVal( self, section, valname ):
 
+        debug_msg( 10, "Parsing: '" + self.config_file + "' - searching for section: " + section + " value: " + valname )
+
         cfg_fp      = open( self.config_file )
         cfg_lines   = cfg_fp.readlines()
@@ -146 +145 @@
         section_start = False
         section_found = False
+        include_start = False
         value         = None
         comment_start = False
 
+        acc_count     = 0
+
         for line in cfg_lines:
 
             line = line.strip()
+            debug_msg( 10, "line org: " + line )
             line = self.removeComments( line )
-
-            if line.find( '/*' ) != -1:
-
-                line = line[:line.find('/*')]
-                comment_start = True
-
-            if line.find( '*/' ) != -1:
-
-                line = line[line.find('*/'):]
+            debug_msg( 10, "line remove comments: " + line )
+
+            if line.find( '/*' ) != -1 and line.find( 'include', 0, 7 ):
+
+                debug_msg( 10, "line comment start */: " + line )
+
+                if line.find( '*/' ) != -1:
+
+                    begin_line = line[:line.find('/*')]
+                    rest_line = line[(line.find('*/')+2):]
+
+                    line = begin_line + rest_line
+
+                    debug_msg( 10, "line comment end */: " + line )
+
+                else:
+
+                    line = line[:line.find('/*')]
+                    comment_start = True
+
+                    debug_msg( 10, "line find /*: " + line )
+
+                debug_msg( 10, "line find /*: " + line )
+
+            if line.find( '*/' ) != -1 and comment_start:
+
+                line = line[(line.find('*/')+2):]
                 comment_start = False
+                debug_msg( 10, "line comment end*/: " + line )
 
             if comment_start:
 
+                debug_msg( 10, "line ignoring comment: " + line )
                 continue
 
             if line.find( 'include' ) != -1:
 
-                line = line.removeHaakjes()
-
-                include_line  = line.strip(' ')[1:]
+                debug_msg( 10, "line include: " + line )
+                line = self.removeHaakjes( line )
+                line = self.removeQuotes( line )
+                debug_msg( 10, "line removeHaakjes: " + line )
+
+                include_line  = line.split(' ')[1]
+
+                debug_msg( 10, "line includes: " + str( include_line ) )
 
                 for include_file in glob( include_line ):
+
+                    debug_msg( 10, "include file found: '" + include_file + "'" )
 
                     include_parser = GangliaConfigParser( include_file )
@@ -184 +214 @@
                         #break ? FIXME value can be overriden by other includes: perhaps users problem
 
+                        debug_msg( 10, "VALUE found: '" + value + "'" )
+
                     del include_parser
 
@@ -190 +222 @@
                 section_found   = True
 
+                debug_msg( 10, "section start: '" + section + "'" )
+
             if line.find( '{' ) != -1 and section_found:
 
                 section_start   = True
+                acc_count       = acc_count + 1
 
             if line.find( '}' ) != -1 and section_found:
 
-                section_start   = False
-                section_found   = False
+                acc_count       = acc_count - 1
+
+                if acc_count == 0:
+
+                    debug_msg( 10, "section closed: '" + section + "'" )
+                    section_start   = False
+                    section_found   = False
 
             if line.find( valname ) != -1 and section_start:
 
                 value       = string.join( line.split( '=' )[1:], '' ).strip()
+
+        debug_msg( 10, "Parsing done: '" + self.config_file + "' " )
 
         return value