1 files changed, 46 insertions, 13 deletions
diff --git a/buildscripts/cleanbb.py b/buildscripts/cleanbb.py
index 68a8012..261519a 100644
--- a/buildscripts/cleanbb.py
+++ b/buildscripts/cleanbb.py
@@ -3,17 +3,39 @@ import sys
 import os
 import utils
 import time
+from optparse import OptionParser
+
+cwd = os.getcwd();
+if cwd.find("buildscripts" ) > 0 :
+    cwd = cwd.partition( "buildscripts" )[0]
+
+print( "cwd [" + cwd + "]" )
+
+def shouldKill( c ):
+    if c.find( cwd ) >= 0:
+        return True
+
+    if ( c.find( "buildbot" ) >= 0 or c.find( "slave" ) ) and c.find( "/mongo/" ) >= 0:
+        return True
+
+    return False
 
 def killprocs( signal="" ):
-    cwd = os.getcwd();
-    if cwd.find("buildscripts" ) > 0 :
-        cwd = cwd.partition( "buildscripts" )[0]
 
     killed = 0
         
-    for x in utils.getprocesslist():
+    l = utils.getprocesslist()
+    print( "num procs:" + str( len( l ) ) )
+    if len(l) == 0:
+        print( "no procs" )
+        try:
+            print( execsys( "/sbin/ifconfig -a" ) )
+        except Exception,e:
+            print( "can't get interfaces" + str( e ) )
+
+    for x in l:
         x = x.lstrip()
-        if x.find( cwd ) < 0:
+        if not shouldKill( x ):
             continue
         
         pid = x.partition( " " )[0]
@@ -24,20 +46,31 @@ def killprocs( signal="" ):
     return killed
 
 
-def cleanup( root ):
+def cleanup( root , nokill ):
     
+    if nokill:
+        print "nokill requested, not killing anybody"
+    else:
+        if killprocs() > 0:
+            time.sleep(3)
+            killprocs("-9")
+
     # delete all regular files, directories can stay
     # NOTE: if we delete directories later, we can't delete diskfulltest
     for ( dirpath , dirnames , filenames ) in os.walk( root , topdown=False ):
         for x in filenames: 
-            os.remove( dirpath + "/" + x )
+            foo = dirpath + "/" + x
+            print( "removing: " + foo )
+            os.remove( foo )
 
-    if killprocs() > 0:
-        time.sleep(3)
-        killprocs("-9")
 
 if __name__ == "__main__":
+    parser = OptionParser(usage="read the script")
+    parser.add_option("--nokill", dest='nokill', default=False, action='store_true')
+    (options, args) = parser.parse_args()
+
     root = "/data/db/"
-    if len( sys.argv ) > 1:
-        root = sys.argv[1]
-    cleanup( root )
+    if len(args) > 0:
+        root = args[0]
+        
+    cleanup( root , options.nokill )