mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-05-10 20:42:57 +00:00
Merge pull request #2090 from zerotier/dev-validator-fix-dump-at-abort
Save zt node log files on abort
This commit is contained in:
commit
d91f80464d
15
.github/workflows/validate-1m-linux.sh
vendored
15
.github/workflows/validate-1m-linux.sh
vendored
@ -174,7 +174,8 @@ main() {
|
|||||||
if [[ "$both_instances_online" != "true" ]]; then
|
if [[ "$both_instances_online" != "true" ]]; then
|
||||||
echo "One or more instances of ZeroTier failed to come online. Aborting test."
|
echo "One or more instances of ZeroTier failed to come online. Aborting test."
|
||||||
collect_zt_dump_files
|
collect_zt_dump_files
|
||||||
exit 1
|
collect_zt_log_files
|
||||||
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -e "\nJoining networks"
|
echo -e "\nJoining networks"
|
||||||
@ -311,11 +312,10 @@ main() {
|
|||||||
time_test_end=$(date +%s)
|
time_test_end=$(date +%s)
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Rename ZeroTier stdout/stderr logs #
|
# Copy ZeroTier stdout/stderr logs #
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
mv node_1.log "$TEST_FILEPATH_PREFIX-node-log-$node1_id.txt"
|
collect_zt_log_files
|
||||||
mv node_2.log "$TEST_FILEPATH_PREFIX-node-log-$node2_id.txt"
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Generate report #
|
# Generate report #
|
||||||
@ -471,6 +471,11 @@ collect_zt_dump_files() {
|
|||||||
|
|
||||||
$ZT2 dump
|
$ZT2 dump
|
||||||
mv zerotier_dump.txt "$TEST_FILEPATH_PREFIX-node-dump-$node2_id.txt"
|
mv zerotier_dump.txt "$TEST_FILEPATH_PREFIX-node-dump-$node2_id.txt"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
collect_zt_log_files() {
|
||||||
|
cp node_1.log "$TEST_FILEPATH_PREFIX-node-log-$node1_id.txt"
|
||||||
|
cp node_2.log "$TEST_FILEPATH_PREFIX-node-log-$node2_id.txt"
|
||||||
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user