From c16bdfd64fe7ea5996bc8a03c93f392f87913d96 Mon Sep 17 00:00:00 2001
From: Robert Martin-Legene <robert@nic.ar>
Date: Thu, 26 Jul 2018 18:36:41 -0300
Subject: [PATCH] Cleaning up start.sh
---
bin/start.sh | 70 +++++++++++++++++++++++-----------------------------
1 file changed, 31 insertions(+), 39 deletions(-)
diff --git a/bin/start.sh b/bin/start.sh
index 555f331..d80101c 100755
--- a/bin/start.sh
+++ b/bin/start.sh
@@ -11,41 +11,6 @@ bootnodes="enode://${bootnodeid}@[$bootnodev6]:${bootnodeport},enode://${bootnod
bfaconfig max
-function startgeth
-{
- while :
- do
- echo
- echo '***'
- echo
- set -x
- geth \
- --datadir ${BFANODEDIR} \
- $( accountlist ) \
- $( miner ) \
- --networkid $BFANETWORKID \
- --bootnodes "${bootnodes}" \
- --rpc \
- --rpcport $rpcport \
- --rpcapi "eth,net,web3,admin,clique,miner" \
- --port $netport \
- --syncmode full \
- --nousb \
- --txpool.nolocals \
- --txpool.accountslots 128 \
- --txpool.globalslots 32768 \
- --txpool.accountqueue 512 \
- --txpool.globalqueue 8192 \
- --extradata "${BFAEXTRADATA}" \
- --cache 512 \
- --verbosity 3 &
- set +x
- echo $! > ${BFANODEDIR}/geth.pid
- wait
- sleep 60
- done
-}
-
function accountlist
{
local accts=
@@ -77,15 +42,42 @@ function miner
# Start the miner.
-test -e "${BFANODEDIR}/geth.pid" ||
- touch ${BFANODEDIR}/geth.pid
(
flock --nonblock --exclusive 9 || exit 1
- startgeth 2>&1 |
- ${BFAHOME}/bin/log.sh ${BFANODEDIR}/log &
if [ -t 1 ]
then
echo Logging everything to ${BFANODEDIR}/log
echo Consider running: tail -n 1000 -F ${BFANODEDIR}/log
fi
+ while :
+ do
+ echo
+ echo '***'
+ echo
+ set -x
+ geth \
+ --datadir ${BFANODEDIR} \
+ $( accountlist ) \
+ $( miner ) \
+ --networkid $BFANETWORKID \
+ --bootnodes "${bootnodes}" \
+ --rpc \
+ --rpcport $rpcport \
+ --rpcapi "eth,net,web3,admin,clique,miner" \
+ --port $netport \
+ --syncmode full \
+ --nousb \
+ --txpool.nolocals \
+ --txpool.accountslots 128 \
+ --txpool.globalslots 32768 \
+ --txpool.accountqueue 512 \
+ --txpool.globalqueue 8192 \
+ --extradata "${BFAEXTRADATA}" \
+ --cache 512 \
+ --verbosity 3 &
+ set +x
+ echo $! > ${BFANODEDIR}/geth.pid
+ wait
+ sleep 60
+ done 2>&1 | ${BFAHOME}/bin/log.sh ${BFANODEDIR}/log &
) 9>> ${$BFANODEDIR}/geth.pid
--
GitLab