From b8fd8d9ffdff80911766379184eef3ec58ef3759 Mon Sep 17 00:00:00 2001
From: Robert Martin-Legene <robert@nic.ar>
Date: Tue, 8 Oct 2019 21:19:19 -0300
Subject: [PATCH] Mas sencillo en Docker
---
bin/singlestart.sh | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/bin/singlestart.sh b/bin/singlestart.sh
index d8fb623..abce630 100755
--- a/bin/singlestart.sh
+++ b/bin/singlestart.sh
@@ -40,17 +40,12 @@ function reaper()
max=30
}
-if [ "$VIRTUALIZATION" = "DOCKER" ]
-then
- echo "Some log info can be seen with: docker logs bfanode"
-fi
-
# You can start as:
# BFAHOME=/home/bfa/bfa singlestart.sh
# singlestart.sh /home/bfa/bfa
if [ -z "${BFAHOME}" -a -n "$1" -a -f "$1" ]
then
- BFAHOME="$1"
+ export BFAHOME="$1"
fi
if [ -z "${BFAHOME}" ]; then echo "\$BFAHOME not set. Did you source `dirname $0`/env ?" >&2; exit 1; fi
#
@@ -70,22 +65,26 @@ else
fi
source ${BFAHOME}/bin/libbfa.sh
-echo "Logging mostly everything to ${BFANODEDIR}/log"
-echo "Consider running: tail -n 1000 -F ${BFANODEDIR}/log"
if [ "$VIRTUALIZATION" = "DOCKER" ]
then
- echo "or: docker exec -i bfanode bfalog.sh"
-fi
+ echo "See log info with \"docker logs\""
+else
+ echo "Logging mostly everything to ${BFANODEDIR}/log"
+ echo "Consider running: tail -n 1000 -F ${BFANODEDIR}/log"
+ echo "or: bfalog.sh"
-echo "*** Setting up logging."
-# Clean up logging
-LOGDIR=$( mktemp -d )
-trap "rm -rf ${LOGDIR}" EXIT
-LOGPIPE=${LOGDIR}/logpipe
-mknod ${LOGPIPE} p
-${BFAHOME}/bin/log.sh ${BFANODEDIR}/log < ${LOGPIPE} &
-PIDIDX[$!]="log.sh"
-exec > ${LOGPIPE} 2>&1
+ # Docker has it's own logging facility, so we will not use our own
+ # logging functionality if we're in docker.
+ echo "*** Setting up logging."
+ # Clean up logging
+ LOGDIR=$( mktemp -d )
+ trap "rm -rf ${LOGDIR}" EXIT
+ LOGPIPE=${LOGDIR}/logpipe
+ mknod ${LOGPIPE} p
+ ${BFAHOME}/bin/log.sh ${BFANODEDIR}/log < ${LOGPIPE} &
+ PIDIDX[$!]="log.sh"
+ exec > ${LOGPIPE} 2>&1
+fi
echo "*** Starting geth."
# "NoPruning=true" means "--gcmode archive"
--
GitLab