diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-04 07:38:38 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-04 07:38:38 +0100 |
| commit | 9f633bc1252ceb98999fb74c56cc3e3914067743 (patch) | |
| tree | c0bbbd3a7718508571bc0eb3b3500a369cbd2d5b /synctl | |
| parent | big warning (diff) | |
| parent | make synctl default to homesever.log (diff) | |
| download | synapse-9f633bc1252ceb98999fb74c56cc3e3914067743.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Conflicts: CHANGES.rst
Diffstat (limited to 'synctl')
| -rwxr-xr-x | synctl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synctl b/synctl index 763bcce0a0..99dc545ba5 100755 --- a/synctl +++ b/synctl @@ -4,6 +4,7 @@ SYNAPSE="synapse/app/homeserver.py" CONFIGFILE="homeserver.yaml" PIDFILE="homeserver.pid" +LOGFILE="homeserver.log" GREEN=$'\e[1;32m' NORMAL=$'\e[m' @@ -21,13 +22,12 @@ case "$1" in fi echo -n "Starting ..." - $SYNAPSE --daemonize -c "$CONFIGFILE" --pid-file "$PIDFILE" --log-file synapse.log + $SYNAPSE --daemonize -c "$CONFIGFILE" --pid-file "$PIDFILE" --log-file "$LOGFILE" echo "${GREEN}started${NORMAL}" ;; stop) echo -n "Stopping ..." - test -f $PIDFILE && kill `cat $PIDFILE` - echo "${GREEN}stopped${NORMAL}" + test -f $PIDFILE && kill `cat $PIDFILE` && echo "${GREEN}stopped${NORMAL}" ;; restart) $0 stop && $0 start |