Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / scripts / startdaemons.sh

diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 298162673c5a80b822e31825b6d39fdcaee2bf81..0fa72cea118cf0df81d69e9a83cf1806359abdc5 100755 (executable)
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -35,12 +35,14 @@ if [ $# -gt 1 ]; then
 fi
 
 DIR=`dirname $0`
-DAEMONS=`php $DIR/getvaliddaemons.php $ARGSG`
+DAEMONS=`$DIR/getvaliddaemons.php $ARGSG 2>/dev/null | grep -v "FUSE_EDEADLK"`
+
+echo "DAEMONS='${DAEMONS}'"
 
 for f in $DAEMONS; do
 
-         printf "Starting $f...";
-        php $DIR/$f $ARGSD
-        printf "DONE.\n"
+    echo "Starting '$f' ..."
+    php $f $ARGSD 2>/dev/null | grep -v "FUSE_EDEADLK"
+    echo "DONE."
 
 done