From: P2P-Next User <p2p@p2p-next-04-201.grid.pub.ro>
Date: Mon, 22 Nov 2010 11:20:06 +0000 (+0200)
Subject: ControlScripts/clients/swift: swift integration update
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=e160e129c1d6f3247296736ede2b11218dd7599a;p=p2p-testing-infrastructure.git

ControlScripts/clients/swift: swift integration update
---

diff --git a/ControlScripts/client_script_mappings b/ControlScripts/client_script_mappings
index b815434..e483efd 100644
--- a/ControlScripts/client_script_mappings
+++ b/ControlScripts/client_script_mappings
@@ -112,7 +112,7 @@ stop_client()
 			clients/tribler/stop_tribler.sh
 			;;
 		"swift_seeder" | "swift_leecher")
-			clients/swift/stop_swift.sh &
+			clients/swift/stop_swift.sh 
 			;;
 		"xbtut")
 			clients/xbt-unified-tracker/stop_xbtut.sh
@@ -152,7 +152,7 @@ detect_complete_client()
 			clients/tribler/detect_complete_tribler_proxy.sh ${log_file}
 			;;
 		"swift_seeder" | "swift_leecher")
-			clients/swift/detect_complete_swift.sh &
+			clients/swift/detect_complete_swift.sh ${log_file}
 			;;
 	esac
 }
diff --git a/ControlScripts/clients/swift/start_swift_leecher.sh b/ControlScripts/clients/swift/start_swift_leecher.sh
index 83f9949..3fd34fe 100755
--- a/ControlScripts/clients/swift/start_swift_leecher.sh
+++ b/ControlScripts/clients/swift/start_swift_leecher.sh
@@ -27,11 +27,13 @@ else
 	source ../ClientWorkingFolders/TmpLogs/node_config
 fi
 
-HASH=$(echo $TORRENT_FILE | cut -d"/" -f1)
-TRACKER_IP=$(echo $TORRENT_FILE | cut -d"/" -f2)
+TRACKER_IP=$(echo $TORRENT_FILE | cut -d"/" -f1)
+HASH=$(echo $TORRENT_FILE | cut -d"/" -f2)
 
 cd $SWIFT_ABS_PATH
 
-./swift -h $HASH -t ${TRACKER_IP}:6881 -p
+#sleep 5
+echo ./swift -h "$HASH" -t "${TRACKER_IP}:6881" -p > ~/deb
+./swift -h "$HASH" -t "${TRACKER_IP}:6881" -p
 
-#rm -f ${HASH}*
+rm -f ${HASH}*
diff --git a/ControlScripts/clients/swift/start_swift_seeder.sh b/ControlScripts/clients/swift/start_swift_seeder.sh
index f9493c4..be07bee 100755
--- a/ControlScripts/clients/swift/start_swift_seeder.sh
+++ b/ControlScripts/clients/swift/start_swift_seeder.sh
@@ -51,8 +51,11 @@ tmp=${hostname%-*}
 }
 
 OWN_IP=$(hostname_to_ip $(hostname))
-DATA_PATH=$WORKING_FOLDER_REL_PATH/TorrentsAndData
+cd "$WORKING_FOLDER_REL_PATH"/TorrentsAndData
+DATA_PATH=$(pwd)
 
 cd $SWIFT_ABS_PATH
 
-./swift -f ${DATA_PATH}/${TORRENT_FILE} -l ${OWN_IP}:6881 -p
+
+echo ./swift -f "${DATA_PATH}"/"${TORRENT_FILE}" -l ${OWN_IP}:6881 -p > ~/deb
+./swift -f "${DATA_PATH}"/"${TORRENT_FILE}" -l ${OWN_IP}:6881 -p