X-Git-Url: http://git.onelab.eu/?p=mom.git;a=blobdiff_plain;f=swapmon.py;h=6f995fa73eccf12e9265d2106db3d5848d602f65;hp=1076261edfda228c572736a36bcf707f1a2e3688;hb=34e3e7729f3221afbcae3d2122af43c9c32c2450;hpb=2255be4d8e804746aad4994fe48a297e21e01e04

diff --git a/swapmon.py b/swapmon.py
index 1076261..6f995fa 100755
--- a/swapmon.py
+++ b/swapmon.py
@@ -23,7 +23,7 @@ import socket
 import time
 
 # bwlimit exports a few useful functions like run(), get_xid(), and get_slice()
-import bwlimit
+import plnode.bwlimit as bwlimit
 
 # Utility functions
 from pl_mom import *
@@ -171,7 +171,10 @@ def slicestat(names = None):
         # Represent process as a dict of fields
         values = line.split(None, len(fields) - 1)
         if len(values) != len(fields):
-            print "slicestat: failed to parse line:", line
+            if "ERR" in line:
+                pass # ignore spurious error message from vps
+            else:
+                print "slicestat: failed to parse line: " + line
             continue
         proc = dict(zip(fields, values))
 
@@ -185,12 +188,15 @@ def slicestat(names = None):
                 except ValueError:
                     pass
 
-        # vps sometimes prints ERR or the name of the slice 
+        # vps sometimes prints ERR or the name of the slice
             # instead of a context ID if it
         # cannot identify the context of an orphaned (usually dying)
         # process. Skip these processes.
         if (type(proc['xid']) != int) or (type(proc['vsize']) !=int):
-            print "slicestat: failed to parse line:", line
+            if "ERR" in line:
+                pass # ignore spurious error message from vps
+            else:
+                print "slicestat: failed to parse line: " + line
             continue
 
         # Assign (pl_)sshd processes to slice instead of root