moved reload, include log on error, made curl silent
This commit is contained in:
+10
-8
@@ -204,6 +204,7 @@ kill -1 $pid
|
|||||||
#client:
|
#client:
|
||||||
readarray lines <<EOF
|
readarray lines <<EOF
|
||||||
raw
|
raw
|
||||||
|
reload
|
||||||
log
|
log
|
||||||
log bus,update debug
|
log bus,update debug
|
||||||
log
|
log
|
||||||
@@ -282,7 +283,6 @@ r -Z
|
|||||||
r -h fe070400
|
r -h fe070400
|
||||||
w -h fe070400
|
w -h fe070400
|
||||||
nocommand
|
nocommand
|
||||||
reload
|
|
||||||
EOF
|
EOF
|
||||||
while [ ! "$status" = 0 ]; do
|
while [ ! "$status" = 0 ]; do
|
||||||
sleep 5
|
sleep 5
|
||||||
@@ -307,13 +307,13 @@ if [ "$status" = 0 ]; then
|
|||||||
done
|
done
|
||||||
echo "scan result:"
|
echo "scan result:"
|
||||||
./src/tools/ebusctl -p 8877 scan result
|
./src/tools/ebusctl -p 8877 scan result
|
||||||
curl "http://localhost:8878/data/" >/dev/null
|
curl -s "http://localhost:8878/data/" >/dev/null
|
||||||
curl "http://localhost:8878/data/broadcast/?since=1&exact=1&required=" >/dev/null
|
curl -s "http://localhost:8878/data/broadcast/?since=1&exact=1&required=" >/dev/null
|
||||||
curl "http://localhost:8878/data/mc.4/outsidetemp?poll=1" >/dev/null
|
curl -s "http://localhost:8878/data/mc.4/outsidetemp?poll=1" >/dev/null
|
||||||
curl "http://localhost:8878/data/?verbose=1" >/dev/null
|
curl -s "http://localhost:8878/data/?verbose=1" >/dev/null
|
||||||
curl "http://localhost:8878/data/?indexed=1&numeric=1" >/dev/null
|
curl -s "http://localhost:8878/data/?indexed=1&numeric=1" >/dev/null
|
||||||
curl "http://localhost:8878/data/?full" >/dev/null
|
curl -s "http://localhost:8878/data/?full" >/dev/null
|
||||||
curl "http://localhost:8878/data/mc.5/installparam?poll=1&user=test&secret=testpass" >/dev/null
|
curl -s "http://localhost:8878/data/mc.5/installparam?poll=1&user=test&secret=testpass" >/dev/null
|
||||||
curl -T .travis.yml http://localhost:8878/data/
|
curl -T .travis.yml http://localhost:8878/data/
|
||||||
echo "commands done"
|
echo "commands done"
|
||||||
kill $lstpid
|
kill $lstpid
|
||||||
@@ -324,6 +324,8 @@ if [ "x$verify" != 'xaddress 04: slave #25, scanned "MF=153;ID=BBBBB;SW=3031;HW=
|
|||||||
echo "error unexpected result from info command: $verify"
|
echo "error unexpected result from info command: $verify"
|
||||||
kill $pid
|
kill $pid
|
||||||
kill $srvpid
|
kill $srvpid
|
||||||
|
echo "ebusd log:"
|
||||||
|
cat "$PWD/ebusd.log"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
kill $pid
|
kill $pid
|
||||||
|
|||||||
Reference in New Issue
Block a user