summary refs log tree commit diff
diff options
context:
space:
mode:
authormanuroe <manu@matrix.org>2015-06-04 17:58:17 +0200
committermanuroe <manu@matrix.org>2015-06-04 17:58:17 +0200
commit378a0f7a79a22a1211e3d048b7fd9e99d1efc7de (patch)
treec458539bbfe7d93e70e0823cc0ebf70b1192e3cf
parentpep8 (diff)
downloadsynapse-378a0f7a79a22a1211e3d048b7fd9e99d1efc7de.tar.xz
Federation demo start.sh: Fixed --no-rate-limit param in the script
-rwxr-xr-xdemo/clean.sh6
-rwxr-xr-xdemo/start.sh17
2 files changed, 13 insertions, 10 deletions
diff --git a/demo/clean.sh b/demo/clean.sh

index c5dabd4767..31007737f8 100755 --- a/demo/clean.sh +++ b/demo/clean.sh
@@ -11,7 +11,9 @@ if [ -f $PID_FILE ]; then exit 1 fi -find "$DIR" -name "*.log" -delete -find "$DIR" -name "*.db" -delete +for port in 8080 8081 8082; do + rm -rf demo/$port + rm -rf demo/media_store.$port +done rm -rf $DIR/etc diff --git a/demo/start.sh b/demo/start.sh
index b9cc14b9d2..b5dea5e176 100755 --- a/demo/start.sh +++ b/demo/start.sh
@@ -8,14 +8,6 @@ cd "$DIR/.." mkdir -p demo/etc -# Check the --no-rate-limit param -PARAMS="" -if [ $# -eq 1 ]; then - if [ $1 = "--no-rate-limit" ]; then - PARAMS="--rc-messages-per-second 1000 --rc-message-burst-count 1000" - fi -fi - export PYTHONPATH=$(readlink -f $(pwd)) @@ -35,6 +27,15 @@ for port in 8080 8081 8082; do -H "localhost:$https_port" \ --config-path "$DIR/etc/$port.config" \ + # Check script parameters + if [ $# -eq 1 ]; then + if [ $1 = "--no-rate-limit" ]; then + # Set high limits in config file to disable rate limiting + perl -p -i -e 's/rc_messages_per_second.*/rc_messages_per_second: 1000/g' $DIR/etc/$port.config + perl -p -i -e 's/rc_message_burst_count.*/rc_message_burst_count: 1000/g' $DIR/etc/$port.config + fi + fi + python -m synapse.app.homeserver \ --config-path "$DIR/etc/$port.config" \ -D \