dockertest: logging niceness
Juan Batiz-Benet committed
Jan 3, 2015 at 00:29 UTC
e3223a073e1674301786c9f3adc6a6de07739d78
2 files changed
+10
-7
dockertest/client/run.sh
+7
-5
@@ -1,14 +1,16 @@
1
ipfs bootstrap add /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
2
3
+
4
+echo "dockertest> starting client daemon"
5
ipfs daemon &
6
sleep 3
7
8
while [ ! -f /data/idtiny ]
9
do
8
- echo waiting for server to add the file...
10
+ echo "dockertest> waiting for server to add the file..."
11
sleep 1
12
done
11
-echo client found file with hash: $(cat /data/idtiny)
13
+echo "dockertest> client found file with hash:" $(cat /data/idtiny)
14
15
ipfs cat $(cat /data/idtiny) > filetiny
16
@@ -23,10 +25,10 @@ fi
25
26
while [ ! -f /data/idrand ]
27
do
26
- echo waiting for server to add the file...
28
+ echo "dockertest> waiting for server to add the file..."
29
sleep 1
30
done
29
-echo client found file with hash: $(cat /data/idrand)
31
+echo "dockertest> client found file with hash:" $(cat /data/idrand)
32
33
cat /data/idrand
34
@@ -44,4 +46,4 @@ if (($? > 0)); then
46
exit 1
47
fi
48
47
-echo "success"
49
+echo "dockertest> success"
dockertest/server/run.sh
+3
-2
@@ -3,6 +3,7 @@ ipfs bootstrap add /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_T
3
4
# wait for daemon to start/bootstrap
5
# alternatively use ipfs swarm connect
6
+echo "dockertest> starting server daemon"
7
ipfs daemon &
8
sleep 3
9
# TODO instead of bootrapping: ipfs swarm connect /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
@@ -10,11 +11,11 @@ sleep 3
11
# must mount this volume from data container
12
ipfs add -q /data/filetiny > tmptiny
13
mv tmptiny /data/idtiny
13
-echo added tiny file. hash is $(cat /data/idtiny)
14
+echo "dockertest> added tiny file. hash is" $(cat /data/idtiny)
15
16
ipfs add -q /data/filerand > tmprand
17
mv tmprand /data/idrand
17
-echo added rand file. hash is $(cat /data/idrand)
18
+echo "dockertest> added rand file. hash is" $(cat /data/idrand)
19
20
# allow ample time for the client to pull the data
21
sleep 10000000