Changeset 254 for trunk/jobmond

Timestamp:

04/27/06 09:47:08 (18 years ago)

Author:

bastiaans

Message:

jobmond/jobmond.py:

• fixed bug: queued jobs were no longer being reported

File:

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

trunk/jobmond/jobmond.py

@@ -345 +345 @@
                                                 count_mynodes = count_mynodes + int( nodepart )
                                                 
-                                nodeslist = count_mynodes
+                                nodeslist = str( count_mynodes )
                         else:
                                 start_timestamp = ''
@@ -411 +411 @@
                         val_list_vals_len       = len( string.join( val_list.values() ) ) + len(val_list.values())
 
-                        if (val_name != 'nodes' and val_value != '') or (val_name == 'nodes' and jobattrs['status'] == 'Q'):
-
-                                if (val_list_names_len + len(val_name) ) + (val_list_vals_len + len(str(val_value)) ) > METRIC_MAX_VAL_LEN:
-
-                                        gval_lists.append( val_list )
-                                        val_list = { }
-
-                                val_list[ val_name ] = val_value
-
-                        elif val_name == 'nodes' and jobattrs['status'] == 'R':
+                        if val_name == 'nodes' and jobattrs['status'] == 'R':
 
                                 node_str = None
@@ -441 +432 @@
                                 gval_lists.append( val_list )
                                 val_list = { }
+
+                        elif val_value != '':
+
+                                if (val_list_names_len + len(val_name) ) + (val_list_vals_len + len(str(val_value)) ) > METRIC_MAX_VAL_LEN:
+
+                                        gval_lists.append( val_list )
+                                        val_list = { }
+
+                                val_list[ val_name ] = val_value
+
+                if len(val_list) > 0:
+                        gval_lists.append( val_list )
 
                 str_list = [ ]