ControlScripts/clients: clients killing bug resolved

diff --git a/ClientWorkingFolders/TorrentsAndData/.gitignore b/ClientWorkingFolders/TorrentsAndData/.gitignore
index f26c584a3119ac9337b89a63edfc447cf463290d..7b6ccc406cd89a8efc4a82322f4e8a4b060ae5b8 100644 (file)
--- a/ClientWorkingFolders/TorrentsAndData/.gitignore
+++ b/ClientWorkingFolders/TorrentsAndData/.gitignore
@@ -1,5 +1 @@
-/Data.16M
-/Data.4M
-/Data.256M
-/Data.64M
-/Data.1024M
+/Data.*

diff --git a/ControlScripts/clients/next-share/stop_nextshare.sh b/ControlScripts/clients/next-share/stop_nextshare.sh
index 406f464d2b7e18295909ce7ef916ff3b798878ef..8c48d915d27f98fedac56ead0449cc59fb674727 100755 (executable)
--- a/ControlScripts/clients/next-share/stop_nextshare.sh
+++ b/ControlScripts/clients/next-share/stop_nextshare.sh
@@ -12,4 +12,4 @@ if [ ! $# -eq 0 ]; then
        exit 1
 fi
 
-pkill -f cmdlinedl.py
+pkill -KILL -f cmdlinedl.py

diff --git a/ControlScripts/clients/swift/stop_swift.sh b/ControlScripts/clients/swift/stop_swift.sh
index c59a8f9d75364cfb9600ac896803d35b534873f1..e373a9c58422cdc362528d2a35c4d7e0860e6787 100755 (executable)
--- a/ControlScripts/clients/swift/stop_swift.sh
+++ b/ControlScripts/clients/swift/stop_swift.sh
@@ -11,4 +11,4 @@ if [ ! $# -eq 0 ]; then
        exit 1
 fi
 
-pkill swift
+pkill -KILL -f swift

diff --git a/ControlScripts/clients/tribler/stop_tribler.sh b/ControlScripts/clients/tribler/stop_tribler.sh
index 65229ec10147ed273b9194f1df663cd728e9abd2..3ecb2dee682196bf0eba8619bda46c37ec8e2afa 100755 (executable)
--- a/ControlScripts/clients/tribler/stop_tribler.sh
+++ b/ControlScripts/clients/tribler/stop_tribler.sh
@@ -11,4 +11,4 @@ if [ ! $# -eq 0 ]; then
        exit 1
 fi
 
-pkill python2.6
+pkill -KILL -f python2.6

diff --git a/ControlScripts/run_campaign.sh b/ControlScripts/run_campaign.sh
index 99d9135a73b11cae8e2fe6a86c77d8bc51ccd4cf..f6c277c498646434622c6dceef5306173db28c7a 100755 (executable)
--- a/ControlScripts/run_campaign.sh
+++ b/ControlScripts/run_campaign.sh
@@ -48,8 +48,7 @@ if [ ! -f $CONFIG_FILES_REL_PATH/$CAMPAIGN_FILE ]; then
 fi
 
 # Kill all the clients that are still running
-./stop_all_clients.sh
-
+#./stop_all_clients.sh
 
 # Create the results folder for the campaign
 # Check if the campaign results folder already exists