Changeset 285 for trunk

Timestamp:

12/20/12 11:56:42 (11 years ago)

Author:

bas

Message:

Fixed an error in status line for EVENT parseing

File:

• trunk/src/PBSQuery.py (modified) (2 diffs)

trunk/src/PBSQuery.py

@@ -180 +180 @@
 
                             ## Support for multiple EVENT mesages in format [key=value:]+ 
-                            #  format eg: message=EVENT:sample.time=1288864220.003:cputotals.user=0
+                            #  format eg: message=EVENT:sample.time=1288864220.003,EVENT:kernel=upgrade,cputotals.user=0
                             #             message=ERROR <text>
                             #
@@ -196 +196 @@
 
                                 else:
+
                                     ## ERROR message
                                     #
                                     new['error'] = tmp_l [1:]
 
-                                ## continue with next status value
-                                #
-                                continue
-
-                                    
-                            ## Check if we already added the key
-                            #
-                            if new.has_key(a.name):
-                                new[a.name][ tmp_l[0] ] = tmp_l[1:]
+                            elif tmp_l[0].startswith('EVENT:'): 
+
+                                  message_list = v.split(':')
+                                  for event_type in message_list[1:]:
+                                      tmp_l = event_type.split('=')
+                                      new['event'][ tmp_l[0] ] = tmp_l[1:]
 
                             else:
-                                tmp_d  = dict()
-                                tmp_d[ tmp_l[0] ] = tmp_l[1:]
-                                new[a.name] = class_func(tmp_d) 
+                                  ## Check if we already added the key
+                                  #
+                                  if new.has_key(a.name):
+
+                                      new[a.name][ tmp_l[0] ] = tmp_l[1:] 
+
+                                  else:
+
+                                      tmp_d  = dict()
+                                      tmp_d[ tmp_l[0] ] = tmp_l[1:]
+                                      new[a.name] = class_func(tmp_d) 
 
                     else: 
+
                         ## Check if it is a resource type variable, eg:
                         #  - Resource_List.(nodes, walltime, ..)