From: "cron2 (Code Review)" Date: Wed, 18 Jun 2025 16:14:06 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., sasepp@...2783... Message-ID: <4a161ab64652388f4263cb431eb4f3c479623ab7-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="VjmFrCVb6sg="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: t_server_null: print error when server startup fails List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mattock Cc: flichtenheld , plaisthos , openvpn-devel --VjmFrCVb6sg= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/10= 24?usp=3Demail ) Change subject: t_server_null: print error when server startup fails ...................................................................... t_server_null: print error when server startup fails Use "&" to background so that the exit code and all output can be obtained in all failure cases. Change-Id: I39dc6b08952a06dae7901e468f9487c8541d83c3 Signed-off-by: Samuli Sepp=C3=A4nen Acked-by: Gert Doering Message-Id: <20250618141328.4600-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31= 932.html Signed-off-by: Gert Doering --- M tests/t_server_null_default.rc M tests/t_server_null_server.sh 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/tests/t_server_null_default.rc b/tests/t_server_null_default.rc index 365b5a8..41ec591 100755 --- a/tests/t_server_null_default.rc +++ b/tests/t_server_null_default.rc @@ -38,7 +38,7 @@ MAX_CLIENTS=3D"10" CLIENT_MATCH=3D"Test-Client" SERVER_EXEC=3D"${top_builddir}/src/openvpn/openvpn" -SERVER_BASE_OPTS=3D"--daemon --local 127.0.0.1 --dev tun --topology subnet= --max-clients $MAX_CLIENTS --persist-tun --verb 3 --duplicate-cn" +SERVER_BASE_OPTS=3D"--local 127.0.0.1 --dev tun --topology subnet --max-cl= ients $MAX_CLIENTS --persist-tun --verb 3 --duplicate-cn" SERVER_CIPHER_OPTS=3D"" SERVER_CERT_OPTS=3D"--ca ${CA} --cert ${SERVER_CERT} --key ${SERVER_KEY} -= -tls-auth ${TA} 0" SERVER_CONF_BASE=3D"${SERVER_BASE_OPTS} ${SERVER_CIPHER_OPTS} ${SERVER_CER= T_OPTS}" diff --git a/tests/t_server_null_server.sh b/tests/t_server_null_server.sh index acf8479..65b7d56 100755 --- a/tests/t_server_null_server.sh +++ b/tests/t_server_null_server.sh @@ -11,20 +11,18 @@ # Allow reading this file even umask values are strict touch "$log" - if [ -z "${RUN_SUDO}" ]; then - "${server_exec}" \ - $server_conf \ - --status "${status}" 1 \ - --log "${log}" \ - --writepid "${pid}" \ - --explicit-exit-notify 3 - else - $RUN_SUDO "${server_exec}" \ - $server_conf \ - --status "${status}" 1 \ - --log "${log}" \ - --writepid "${pid}" \ - --explicit-exit-notify 3 + # Try to launch the server + $RUN_SUDO "${server_exec}" \ + $server_conf \ + --status "${status}" 1 \ + --writepid "${pid}" \ + --explicit-exit-notify 3 > "$log" 2>&1 & + + sleep 1 + + if ! [ -r "$pid" ] || [ -z "$pid" ]; then + echo "ERROR: failed to start server $server_name" + tail -n 20 "$log" fi } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1024?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I39dc6b08952a06dae7901e468f9487c8541d83c3 Gerrit-Change-Number: 1024 Gerrit-PatchSet: 4 Gerrit-Owner: mattock Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --VjmFrCVb6sg= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

t_server_null: print error when server startu=
p fails

Use "&" to background so that the exit code an= d all output can be
obtained in all failure cases.

Change-Id: I39= dc6b08952a06dae7901e468f9487c8541d83c3
Signed-off-by: Samuli Sepp=C3=A4n= en <samuli.seppanen@...277...>
Acked-by: Gert Doering <gert@...493...= 1296...>
Message-Id: <20250618141328.4600-1-gert@...1296...>URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg3= 1932.html
Signed-off-by: Gert Doering <gert@...1296...>
---
= M tests/t_server_null_default.rc
M tests/t_server_null_server.sh
2 fi= les changed, 13 insertions(+), 15 deletions(-)

diff --git a/tests/t_server_null_default.rc b/tests/t_server_null_defaul=
t.rc
index 365b5a8..41ec591 100755
--- a/te= sts/t_server_null_default.rc
+++ b/tests/t_server_null_defa= ult.rc
@@ -38,7 +38,7 @@
MAX_CLIENTS=3D&qu= ot;10"
CLIENT_MATCH=3D"Test-Client"<= br> SERVER_EXEC=3D"${top_builddir}/src/openvpn/openvpn"

-SERVER_BASE_OPTS=3D"= --daemon --local 127.0.0.1 --dev tun --topology subnet --max-clients $MAX_C= LIENTS --persist-tun --verb 3 --duplicate-cn"
+SERVER_BASE_OPTS=3D"--local 127.0.0.1 -= -dev tun --topology subnet --max-clients $MAX_CLIENTS --persist-tun --verb = 3 --duplicate-cn"
SERVER_CIPHER_OPTS=3D""
SERVER_CERT_OPTS=3D"--ca ${CA} --cert ${SERVER_CERT} -= -key ${SERVER_KEY} --tls-auth ${TA} 0"
SERVER_CONF_BA= SE=3D"${SERVER_BASE_OPTS} ${SERVER_CIPHER_OPTS} ${SERVER_CERT_OPTS}&qu= ot;
diff --git a/tests/t_server_null_server.sh b/tests/t_se= rver_null_server.sh
index acf8479..65b7d56 100755--- a/tests/t_server_null_server.sh
+++ b/tests/t_se= rver_null_server.sh
@@ -11,20 +11,18 @@
= # Allow reading this file even umask values are strict
= touch "$log"

- if [ -z "${RUN_SUDO}" ]; then- "${server_exec}&qu= ot; \
- $server= _conf \
- --sta= tus "${status}" 1 \
- --log "${log}" \
- --writepid "${pid}" \
- --explicit-exit-notify 3<= /span>
- else
- $RUN_SUDO "${server_ex= ec}" \

- = $server_conf \
- --status "${status}" 1 \
- --log "${log}&quo= t; \
- = --writepid "${pid}" \
- --explicit-exit-notify 3
+ # Try to launch the server+ $RUN_SUDO "${server= _exec}" \
+ = $server_conf \
+ --status "${status}" 1 \
+ --writepid "${pid}&q= uot; \
+ = --explicit-exit-notify 3 > "$log" 2>&1 &+
+ sleep 1
+
= + if ! [ -r "$pid" ] || [ -z "$pid" ]; then+ echo "ERROR: fa= iled to start server $server_name"
+ tail -n 20 "$log"
= fi
}


=

To view, visit change 1024. To unsubscribe, or for help writing mail filters= , visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I39dc6b08952a06dae7901e468f9= 487c8541d83c3
Gerrit-Change-Number: 1024
Gerrit-PatchSet: 4
Gerrit-Owner: mattock <sasepp@...2783...>= ;
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--VjmFrCVb6sg=--