summaryrefslogtreecommitdiff
path: root/examples/docker-minimal
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-02-27 03:17:02 +0100
committerLinus Nordberg <linus@nordberg.se>2015-02-27 03:17:02 +0100
commit1060641f43718304c46c1614c52ff66270c0a038 (patch)
tree1a027373eca837a6acd4bd7eec3d4f250ba20f2f /examples/docker-minimal
parentb5a2da0cdbeeb6ce7417553898c6739ee98e965a (diff)
Make merge.sh actually work.
Diffstat (limited to 'examples/docker-minimal')
-rwxr-xr-xexamples/docker-minimal/docker/merge.sh16
1 files changed, 10 insertions, 6 deletions
diff --git a/examples/docker-minimal/docker/merge.sh b/examples/docker-minimal/docker/merge.sh
index cf10ac1..93808c5 100755
--- a/examples/docker-minimal/docker/merge.sh
+++ b/examples/docker-minimal/docker/merge.sh
@@ -1,22 +1,26 @@
#! /bin/sh
+S1=300; [ -n "$1" ] && S1=$1
+S2=1200; [ -n "$2" ] && S2=$2
+
[ -d mergedb ] && rm -rf mergedb
mkdir mergedb
mkdir mergedb/chains
touch mergedb/logorder
-echo "merge: waiting five minutes before merging for the first time"
-sleep 300
+date
+echo "merge: waiting $(expr $S1 / 60)m$(expr $S1 % 60)s before merging for the first time"
+sleep $S1
while true; do
echo "merge: merging"
date
- catlfish/tools/merge.py \
+ tools/merge.py \
--baseurl https://127.0.0.1:8080/ \
--storage https://127.0.0.1:8081/ \
--frontend https://127.0.0.1:8082/ \
--mergedb mergedb \
- --keyfile examples/docker-minimal/docker/test/eckey.pem
- echo "merge: waiting 20 minutes before merging again"
- sleep 1200
+ --keyfile examples/docker-minimal/docker/eckey.pem
+ echo "merge: waiting $(expr $S2 / 60)m$(expr $S2 % 60)s before merging again"
+ sleep $S2
done