Sitic has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222510
Change subject: Use webservice-new insead of portgrabber
......................................................................
Use webservice-new insead of portgrabber
What could possibly go wrong?
Change-Id: I7ca6c6bf5606ce43b5c674538d0f3c819a16d5d1
---
D scripts/_sge_webserver.sh
M scripts/restart_webserver.sh
M scripts/start_webserver.sh
D scripts/stop_webserver.sh
R scripts/webserver.sh
5 files changed, 2 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/crosswatch
refs/changes/10/222510/1
diff --git a/scripts/_sge_webserver.sh b/scripts/_sge_webserver.sh
deleted file mode 100755
index 411df8d..0000000
--- a/scripts/_sge_webserver.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd `dirname $0`
-exec portgrabber crosswatch ./_sge_webserver_internal.sh
diff --git a/scripts/restart_webserver.sh b/scripts/restart_webserver.sh
index ef5abe6..02bb0cc 100755
--- a/scripts/restart_webserver.sh
+++ b/scripts/restart_webserver.sh
@@ -1,7 +1,2 @@
#!/bin/bash
-cd `dirname $0`
-./stop_webserver.sh
-while [ "$(qstat -q webgrid-generic | wc -l)" -ge 3 ]; do
- sleep 1
-done
-./start_webserver.sh
+webservice-new restart
diff --git a/scripts/start_webserver.sh b/scripts/start_webserver.sh
index a045a1a..28a3e5d 100755
--- a/scripts/start_webserver.sh
+++ b/scripts/start_webserver.sh
@@ -1,4 +1,3 @@
#!/bin/bash
cd `dirname $0`
-echo "starting webserver"
-jstart -N tornado-crosswatch -once -q webgrid-generic -l release=trusty -mem
3G ./_sge_webserver.sh
+webservice-new generic start "$PWD/webserver.sh"
diff --git a/scripts/stop_webserver.sh b/scripts/stop_webserver.sh
deleted file mode 100755
index fa634d7..0000000
--- a/scripts/stop_webserver.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-echo "stopping webserver"
-qstat -q webgrid-generic | awk '{ if ($1~/[0-9]+/) cmd="qdel " $1;
system(cmd); close(cmd)}'
diff --git a/scripts/_sge_webserver_internal.sh b/scripts/webserver.sh
similarity index 87%
rename from scripts/_sge_webserver_internal.sh
rename to scripts/webserver.sh
index 0d22884..cca236b 100755
--- a/scripts/_sge_webserver_internal.sh
+++ b/scripts/webserver.sh
@@ -2,5 +2,4 @@
source $HOME/.virtualenvs/backend/bin/activate
cd `dirname $0`
cd ..
-export PORT=$1
python -m backend $PORT
--
To view, visit https://gerrit.wikimedia.org/r/222510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ca6c6bf5606ce43b5c674538d0f3c819a16d5d1
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/crosswatch
Gerrit-Branch: master
Gerrit-Owner: Sitic <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
