From aa15a1b29e2fc7f03dafc9301c65e32cb82e4cb4 Mon Sep 17 00:00:00 2001 From: simon987 Date: Sun, 5 May 2019 13:48:13 -0400 Subject: [PATCH] Fixes --- jenkins/deploy.sh | 3 ++- requirements.txt | 3 ++- src/tt_drone/worker.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jenkins/deploy.sh b/jenkins/deploy.sh index e3025a2..d509821 100755 --- a/jenkins/deploy.sh +++ b/jenkins/deploy.sh @@ -2,6 +2,8 @@ export DRONEROOT="task_tracker_drone" +screen -S tt_drone -X quit + cd ${DRONEROOT} virtualenv env --download --clear -p python3.7 source env/bin/activate @@ -9,7 +11,6 @@ python --version pip install -r requirements.txt deactivate -screen -S tt_drone -X quit echo "starting drone" screen -S tt_drone -d -m bash -c "source env/bin/activate && python src/drone.py" sleep 1 diff --git a/requirements.txt b/requirements.txt index 1f311f5..81bc088 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ requests -bs4 \ No newline at end of file +bs4 +Pillow \ No newline at end of file diff --git a/src/tt_drone/worker.py b/src/tt_drone/worker.py index b4a89b8..2ae1d45 100644 --- a/src/tt_drone/worker.py +++ b/src/tt_drone/worker.py @@ -64,7 +64,7 @@ class WorkerContext: json_result["result"], json_result[ "verification"] if "verification" in json_result else 0).text - + " in " + str(end_time - start_time) + "ms") + + " in " + str(end_time - start_time) + "s") except Exception as e: print(str(e) + traceback.format_exc()) else: