Changeset 1680 for pykota/trunk/pykota/accounters/software.py

Timestamp:

08/26/04 00:34:39 (20 years ago)

Author:

jalet

Message:

Now both software and hardware accounting raise an exception when no valid
result can be extracted from the subprocess' output.
Hardware accounting now reads subprocess' output until an integer is read
or data is exhausted : it now behaves just like software accounting in this
aspect.

Files:

• pykota/trunk/pykota/accounters/software.py (modified) (4 diffs)

pykota/trunk/pykota/accounters/software.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.9  2004/08/25 22:34:39  jalet
+# Now both software and hardware accounting raise an exception when no valid
+# result can be extracted from the subprocess' output.
+# Hardware accounting now reads subprocess' output until an integer is read
+# or data is exhausted : it now behaves just like software accounting in this
+# aspect.
+#
 # Revision 1.8  2004/08/22 14:04:47  jalet
 # Tries to fix problem with subprocesses outputting more datas than needed
@@ -74 +81 @@
             self.filter.printInfo(_("Unable to compute job size with accounter %s") % msg)
         
-        pagecount = 0
+        pagecounter = None
         try :
             answer = child.fromchild.read()
@@ -84 +91 @@
             for i in range(len(lines)) : 
                 try :
-                    pagecount = int(lines[i])
+                    pagecounter = int(lines[i])
                 except (AttributeError, ValueError) :
-                    self.filter.printInfo(_("Unable to compute job size with accounter %s") % self.arguments)
-                    self.filter.printInfo(_("Line skipped in accounter's output. Trying again..."))
+                    self.filter.printInfo(_("Line [%s] skipped in accounter's output. Trying again...") % lines[i])
                 else :    
                     break
@@ -102 +108 @@
                 status = retcode
             self.filter.printInfo(_("Software accounter %s exit code is %s") % (self.arguments, str(status)))
-        self.filter.logdebug("Software accounter %s said job is %s pages long." % (self.arguments, pagecount))
-        return pagecount    
             
+        if pagecounter is None :    
+            raise PyKotaAccounterError, _("Unable to compute job size with accounter %s") % self.arguments
+            
+        self.filter.logdebug("Software accounter %s said job is %s pages long." % (self.arguments, pagecounter))
+        return pagecounter    
+