Skip to content

Commit ded9735

Browse files
authored
Merge pull request #2923 from IntersectMBO/start_cluster_log_var
feat: add START_CLUSTER_LOG variable for logging
2 parents 754c3be + 2740469 commit ded9735

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

cardano_node_tests/cluster_scripts/conway/start-cluster

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ SOCKET_PATH="$(readlink -m "$CARDANO_NODE_SOCKET_PATH")"
1717
STATE_CLUSTER="${SOCKET_PATH%/*}"
1818
STATE_CLUSTER_NAME="${STATE_CLUSTER##*/}"
1919
SUPERVISORD_SOCKET_PATH="${STATE_CLUSTER}/supervisord.sock"
20+
START_CLUSTER_LOG="${STATE_CLUSTER}/start-cluster.log"
2021

2122
INSTANCE_NUM="%%INSTANCE_NUM%%"
2223
if [[ "$SOCKET_PATH" != *"/state-cluster${INSTANCE_NUM}/"* ]]; then
@@ -59,7 +60,7 @@ fi
5960
cardano_cli_log() {
6061
local out retval _
6162

62-
echo cardano-cli "$@" >> "${STATE_CLUSTER}/start-cluster.log"
63+
echo cardano-cli "$@" >> "$START_CLUSTER_LOG"
6364

6465
for _ in {1..3}; do
6566
set +e

cardano_node_tests/cluster_scripts/conway_fast/start-cluster

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ SOCKET_PATH="$(readlink -m "$CARDANO_NODE_SOCKET_PATH")"
1717
STATE_CLUSTER="${SOCKET_PATH%/*}"
1818
STATE_CLUSTER_NAME="${STATE_CLUSTER##*/}"
1919
SUPERVISORD_SOCKET_PATH="${STATE_CLUSTER}/supervisord.sock"
20+
START_CLUSTER_LOG="${STATE_CLUSTER}/start-cluster.log"
2021

2122
INSTANCE_NUM="%%INSTANCE_NUM%%"
2223
if [[ "$SOCKET_PATH" != *"/state-cluster${INSTANCE_NUM}/"* ]]; then
@@ -64,7 +65,7 @@ fi
6465

6566
cardano_cli_log() {
6667
local out retval _
67-
echo cardano-cli "$@" >> "${STATE_CLUSTER}/start-cluster.log"
68+
echo cardano-cli "$@" >> "$START_CLUSTER_LOG"
6869

6970
for _ in {1..3}; do
7071
set +e

cardano_node_tests/cluster_scripts/mainnet_fast/start-cluster

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ SOCKET_PATH="$(readlink -m "$CARDANO_NODE_SOCKET_PATH")"
1717
STATE_CLUSTER="${SOCKET_PATH%/*}"
1818
STATE_CLUSTER_NAME="${STATE_CLUSTER##*/}"
1919
SUPERVISORD_SOCKET_PATH="${STATE_CLUSTER}/supervisord.sock"
20+
START_CLUSTER_LOG="${STATE_CLUSTER}/start-cluster.log"
2021

2122
INSTANCE_NUM="%%INSTANCE_NUM%%"
2223
if [[ "$SOCKET_PATH" != *"/state-cluster${INSTANCE_NUM}/"* ]]; then
@@ -64,7 +65,7 @@ fi
6465

6566
cardano_cli_log() {
6667
local out retval _
67-
echo cardano-cli "$@" >> "${STATE_CLUSTER}/start-cluster.log"
68+
echo cardano-cli "$@" >> "$START_CLUSTER_LOG"
6869

6970
for _ in {1..3}; do
7071
set +e

cardano_node_tests/cluster_scripts/testnets/start-cluster

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ SOCKET_PATH="$(readlink -m "$CARDANO_NODE_SOCKET_PATH")"
88
STATE_CLUSTER="${SOCKET_PATH%/*}"
99
STATE_CLUSTER_NAME="${STATE_CLUSTER##*/}"
1010
SUPERVISORD_SOCKET_PATH="${STATE_CLUSTER}/supervisord.sock"
11+
START_CLUSTER_LOG="${STATE_CLUSTER}/start-cluster.log"
1112

1213
INSTANCE_NUM="%%INSTANCE_NUM%%"
1314
if [[ "$SOCKET_PATH" != *"/state-cluster${INSTANCE_NUM}/"* ]]; then
@@ -239,6 +240,6 @@ fi
239240
get_address_balance \
240241
--testnet-magic "$NETWORK_MAGIC" \
241242
--address "$(<"$STATE_CLUSTER/shelley/faucet.addr")" \
242-
> "${STATE_CLUSTER}/start-cluster.log"
243+
> "$START_CLUSTER_LOG"
243244

244245
echo "Cluster started. Run \`$SCRIPT_DIR/stop-cluster\` to stop"

0 commit comments

Comments
 (0)