Mercurial > libervia-backend
view bin/sat @ 2987:8990ed9aad31
quick_frontend (contact list): fixed `nick` use for groupchat:
during the profile connection workflow, joined rooms are retrieved, then presence are
filled, all asynchronously. In some cases, all rooms may not be joined when presence are
filled, resulting in cache being already filled with a `nick` when cache is set for the
room itself. Because of that, a `nick` may be displayed in contact list instead of MUC local
part. This patch fixes it by removing `nick` if it exists when cache a MUC room.
fix 305
author | Goffi <goffi@goffi.org> |
---|---|
date | Fri, 05 Jul 2019 15:58:15 +0200 |
parents | 26edcf3a30eb |
children | ab2696e34d29 |
line wrap: on
line source
#!/bin/sh DEBUG="" DAEMON="" PYTHON="python2" TWISTD="$(which twistd)" kill_process() { # $1 is the file containing the PID to kill, $2 is the process name if [ -f $1 ]; then PID=`cat $1` if ps -p $PID > /dev/null; then printf "Terminating $2... " kill $PID while ps -p $PID > /dev/null; do sleep 0.2 done printf "OK\n" else echo "No running process of ID $PID... removing PID file" rm -f $1 fi else echo "$2 is probably not running (PID file doesn't exist)" fi } #We use python to parse config files eval `"$PYTHON" << PYTHONEND from sat.core.constants import Const as C from sat.memory.memory import fixLocalDir from ConfigParser import SafeConfigParser from os.path import expanduser, join import sys import codecs import locale sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.stdout) fixLocalDir() # XXX: tmp update code, will be removed in the future config = SafeConfigParser(defaults=C.DEFAULT_CONFIG) try: config.read(C.CONFIG_FILES) except: print ("echo \"/!\\ Can't read main config ! Please check the syntax\";") print ("exit 1") sys.exit() env=[] env.append("PID_DIR='%s'" % join(expanduser(config.get('DEFAULT', 'pid_dir')),'')) env.append("LOG_DIR='%s'" % join(expanduser(config.get('DEFAULT', 'log_dir')),'')) env.append("APP_NAME='%s'" % C.APP_NAME) env.append("APP_NAME_FILE='%s'" % C.APP_NAME_FILE) print ";".join(env) PYTHONEND ` APP_NAME="$APP_NAME" PID_FILE="$PID_DIR$APP_NAME_FILE.pid" LOG_FILE="$LOG_DIR$APP_NAME_FILE.log" RUNNING_MSG="$APP_NAME is running" NOT_RUNNING_MSG="$APP_NAME is *NOT* running" # if there is one argument which is "stop", then we kill SaT if [ $# -eq 1 ];then if [ $1 = "stop" ];then kill_process $PID_FILE "$APP_NAME" exit 0 elif [ $1 = "debug" ];then echo "Launching $APP_NAME in debug mode" DEBUG="--debug" elif [ $1 = "fg" ];then echo "Launching $APP_NAME in foreground mode" DAEMON="n" elif [ $1 = "status" ];then if [ -f $PID_FILE ]; then PID=`cat $PID_FILE` ps -p$PID 2>&1 > /dev/null if [ $? = 0 ];then echo "$RUNNING_MSG (pid: $PID)" exit 0 else echo "$NOT_RUNNING_MSG, but a pid file is present (bad exit ?): $PID_FILE" exit 2 fi else echo "$NOT_RUNNING_MSG" exit 1 fi else echo "bad argument, please use one of (stop, debug, fg, status) or no argument" exit 1 fi fi MAIN_OPTIONS="-${DAEMON}o" #Don't change the next lines AUTO_OPTIONS="" ADDITIONAL_OPTIONS="--pidfile $PID_FILE --logfile $LOG_FILE $AUTO_OPTIONS $DEBUG" log_dir=`dirname "$LOG_FILE"` if [ ! -d $log_dir ] ; then mkdir $log_dir fi exec $PYTHON $TWISTD $MAIN_OPTIONS $ADDITIONAL_OPTIONS $APP_NAME_FILE