Skip to content

Commit 525839b

Browse files
platfownerplatfowner
committed
Tweak log message spacing
1 parent e867870 commit 525839b

3 files changed

+16
-19
lines changed

‎deploy_blockchain_genesis_gcp.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,8 @@ if [[ $begin_index -le $PARENT_NODE_INDEX_END ]] && [[ $PARENT_NODE_INDEX_END -g
446446
printf "REST_FUNC_OPTION=$REST_FUNC_OPTION\n"
447447
printf "EVENT_HANDLER_OPTION=$EVENT_HANDLER_OPTION\n"
448448

449-
printf "\n"
450449
START_NODE_CMD="gcloud compute ssh ${!NODE_TARGET_ADDR} --command '$START_NODE_CMD_BASE $SEASON $GCP_USER 0 $node_index $KEEP_CODE_OPTION $KEEP_DATA_OPTION $SYNC_MODE_OPTION $CHOWN_DATA_OPTION $ACCOUNT_INJECTION_OPTION $JSON_RPC_OPTION $UPDATE_FRONT_DB_OPTION $REST_FUNC_OPTION $EVENT_HANDLER_OPTION' --project $PROJECT_ID --zone ${!NODE_ZONE}"
451-
printf "START_NODE_CMD=$START_NODE_CMD\n"
450+
printf "\nSTART_NODE_CMD=$START_NODE_CMD\n"
452451
eval $START_NODE_CMD
453452
sleep 5
454453
inject_account "$node_index"

‎deploy_blockchain_genesis_onprem.sh

+10-11
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ if [[ $KEEP_CODE_OPTION = "--no-keep-code" ]]; then
243243
NODE_TARGET_ADDR="${ONPREM_USER}@${NODE_IP_LIST[${node_index}]}"
244244
NODE_LOGIN_PW="${NODE_PW_LIST[${node_index}]}"
245245

246-
printf "\n* >> Deploying files for parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
247-
printf "FILES_FOR_NODE=${FILES_FOR_NODE}\n"
246+
printf "\n\n* >> Deploying files for parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
247+
printf "FILES_FOR_NODE=${FILES_FOR_NODE}\n\n"
248248

249249
echo ${NODE_LOGIN_PW} | sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) ssh $NODE_TARGET_ADDR "sudo -S rm -rf ~/ain-blockchain; mkdir ~/ain-blockchain; chmod -R 777 ~/ain-blockchain"
250250
sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) scp -r $FILES_FOR_NODE ${NODE_TARGET_ADDR}:~/ain-blockchain/
@@ -269,7 +269,7 @@ if [[ $SETUP_OPTION = "--setup" ]]; then
269269
NODE_TARGET_ADDR="${ONPREM_USER}@${NODE_IP_LIST[${node_index}]}"
270270
NODE_LOGIN_PW="${NODE_PW_LIST[${node_index}]}"
271271

272-
printf "\n* >> Setting up parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
272+
printf "\n\n* >> Setting up parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
273273

274274
echo ${NODE_LOGIN_PW} | sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) ssh ${NODE_TARGET_ADDR} "cd ./ain-blockchain; . setup_blockchain_ubuntu_onprem.sh"
275275
done
@@ -293,18 +293,18 @@ if [[ $KEEP_CODE_OPTION = "--no-keep-code" ]]; then
293293
NODE_TARGET_ADDR="${ONPREM_USER}@${NODE_IP_LIST[${node_index}]}"
294294
NODE_LOGIN_PW="${NODE_PW_LIST[${node_index}]}"
295295

296-
printf "\n* >> Installing node modules for parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
296+
printf "\n\n* >> Installing node modules for parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
297297

298298
sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) ssh ${NODE_TARGET_ADDR} "cd ./ain-blockchain; yarn install --ignore-engines"
299299
done
300300
fi
301301
fi
302302

303303
if [[ $KILL_OPTION = "--skip-kill" ]]; then
304-
printf "\nSkipping process kill...\n"
304+
printf "\n\nSkipping process kill...\n"
305305
else
306306
# kill any processes still alive
307-
printf "\nKilling tracker / blockchain node jobs...\n"
307+
printf "\n\nKilling tracker / blockchain node jobs...\n"
308308

309309
# # Tracker server is killed with PARENT_NODE_INDEX_BEGIN = -1
310310
# if [[ $PARENT_NODE_INDEX_BEGIN = -1 ]]; then
@@ -333,7 +333,7 @@ if [[ $KILL_OPTION = "--kill-only" ]]; then
333333
exit
334334
fi
335335

336-
printf "\nStarting blockchain servers...\n\n"
336+
printf "\n\nStarting blockchain servers...\n\n"
337337
if [[ $KEEP_CODE_OPTION = "--no-keep-code" ]]; then
338338
GO_TO_PROJECT_ROOT_CMD="cd ./ain-blockchain"
339339
else
@@ -368,15 +368,15 @@ if [[ $begin_index -le $PARENT_NODE_INDEX_END ]] && [[ $PARENT_NODE_INDEX_END -g
368368
NODE_LOGIN_PW="${NODE_PW_LIST[${node_index}]}"
369369

370370
if [[ $KEEP_DATA_OPTION = "--no-keep-data" ]]; then
371-
printf "\n* >> Removing old data for parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
371+
printf "\n\n* >> Removing old data for parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
372372

373373
CHAINS_DIR=/home/${SEASON}/ain_blockchain_data/chains
374374
SNAPSHOTS_DIR=/home/${SEASON}/ain_blockchain_data/snapshots
375375
LOGS_DIR=/home/${SEASON}/ain_blockchain_data/logs
376376
echo ${NODE_LOGIN_PW} | sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) ssh ${NODE_TARGET_ADDR} "sudo -S rm -rf $CHAINS_DIR $SNAPSHOTS_DIR $LOGS_DIR"
377377
fi
378378

379-
printf "\n* >> Starting parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
379+
printf "\n\n* >> Starting parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
380380

381381
if [[ $node_index -ge $JSON_RPC_NODE_INDEX_GE ]] && [[ $node_index -le $JSON_RPC_NODE_INDEX_LE ]]; then
382382
JSON_RPC_OPTION="--json-rpc"
@@ -405,9 +405,8 @@ if [[ $begin_index -le $PARENT_NODE_INDEX_END ]] && [[ $PARENT_NODE_INDEX_END -g
405405
printf "REST_FUNC_OPTION=$REST_FUNC_OPTION\n"
406406
printf "EVENT_HANDLER_OPTION=$EVENT_HANDLER_OPTION\n"
407407

408-
printf "\n"
409408
START_NODE_CMD="ssh ${NODE_TARGET_ADDR} '$START_NODE_CMD_BASE $SEASON $ONPREM_USER 0 $node_index $KEEP_CODE_OPTION $KEEP_DATA_OPTION $SYNC_MODE_OPTION $CHOWN_DATA_OPTION $ACCOUNT_INJECTION_OPTION $JSON_RPC_OPTION $UPDATE_FRONT_DB_OPTION $REST_FUNC_OPTION $EVENT_HANDLER_OPTION'"
410-
printf "START_NODE_CMD=$START_NODE_CMD\n"
409+
printf "\nSTART_NODE_CMD=$START_NODE_CMD\n"
411410
eval "echo ${NODE_LOGIN_PW} | sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) ${START_NODE_CMD}"
412411
sleep 5
413412
inject_account "$node_index"

‎deploy_blockchain_incremental_onprem.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,11 @@ function deploy_node() {
210210
local node_target_addr="${ONPREM_USER}@${NODE_IP_LIST[${node_index}]}"
211211
local node_login_pw="${NODE_PW_LIST[${node_index}]}"
212212

213-
printf "\n* >> Deploying files for node $node_index ($node_target_addr) *********************************************************\n\n"
213+
printf "\n\n* >> Deploying files for node $node_index ($node_target_addr) *********************************************************\n\n"
214214

215215
# 1. Copy files for node (if necessary)
216216
if [[ $KEEP_CODE_OPTION = "--no-keep-code" ]]; then
217-
printf "\n<<< Copying files for node $node_index ($node_target_addr) >>>\n\n"
217+
printf "\n\n<<< Copying files for node $node_index ($node_target_addr) >>>\n\n"
218218

219219
echo ${node_login_pw} | sshpass -f <(printf '%s\n' ${node_login_pw}) ssh $node_target_addr "sudo -S rm -rf ~/ain-blockchain; mkdir ~/ain-blockchain; chmod -R 777 ~/ain-blockchain"
220220
SCP_CMD="scp -r $FILES_FOR_NODE ${node_target_addr}:~/ain-blockchain"
@@ -228,7 +228,7 @@ function deploy_node() {
228228
printf "\n\n<<< Setting up node $node_index ($node_target_addr) >>>\n\n"
229229

230230
SETUP_CMD="ssh $node_target_addr 'cd ./ain-blockchain; . setup_blockchain_ubuntu_onprem.sh'"
231-
printf "\nSETUP_CMD=$SETUP_CMD\n\n"
231+
printf "\n\nSETUP_CMD=$SETUP_CMD\n\n"
232232
eval "echo ${node_login_pw} | sshpass -f <(printf '%s\n' ${node_login_pw}) ${SETUP_CMD}"
233233
fi
234234

@@ -262,9 +262,8 @@ function deploy_node() {
262262
printf "REST_FUNC_OPTION=$REST_FUNC_OPTION\n"
263263
printf "EVENT_HANDLER_OPTION=$EVENT_HANDLER_OPTION\n"
264264

265-
printf "\n"
266265
START_NODE_CMD="ssh $node_target_addr '$START_NODE_CMD_BASE $SEASON $ONPREM_USER 0 $node_index $KEEP_CODE_OPTION $KEEP_DATA_OPTION $SYNC_MODE_OPTION $CHOWN_DATA_OPTION $ACCOUNT_INJECTION_OPTION $JSON_RPC_OPTION $UPDATE_FRONT_DB_OPTION $REST_FUNC_OPTION $EVENT_HANDLER_OPTION'"
267-
printf "\nSTART_NODE_CMD=$START_NODE_CMD\n\n"
266+
printf "\n\nSTART_NODE_CMD=$START_NODE_CMD\n\n"
268267
eval "echo ${node_login_pw} | sshpass -f <(printf '%s\n' ${node_login_pw}) ${START_NODE_CMD}"
269268

270269
# 4. Inject node account
@@ -308,7 +307,7 @@ function deploy_node() {
308307
printf "\n\n<<< Waiting until node $node_index ($node_target_addr) is synced >>>\n\n"
309308

310309
WAIT_CMD="ssh $node_target_addr 'cd \$(find /home/${SEASON}/ain-blockchain* -maxdepth 0 -type d); . wait_until_node_sync.sh'"
311-
printf "\nWAIT_CMD=$WAIT_CMD\n\n"
310+
printf "\n\nWAIT_CMD=$WAIT_CMD\n\n"
312311
eval "echo ${node_login_pw} | sshpass -f <(printf '%s\n' ${node_login_pw}) ${WAIT_CMD}"
313312
}
314313

0 commit comments

Comments
 (0)