From 7f3a3d1f81e710b7617f164ed467495580dcf4fc Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Mon, 16 Jun 2025 20:23:40 -0700 Subject: [PATCH] Fix Issue #2148: loadups fail on WSL1 with Xvnc server errors - fixed by adding new flag to medley script, use this flag in loadup script (#2163) * Fix Issue #2155 (loadup -f -b -x fails can't find full.sysout). Reordered loadup so that the sysouts are copied to loadups before loadup-aux and loadup-db are run, and that the product of loadup-aux are copied to loadups before loadup-db is run -- all to make sure that the right prerequisites are available in loadups when needed. Also forced a run of loadup-aux if full.sysout is newer than exports.all when -db is specified. * Fix Issue 2148 - loadups fail on WSL1 with Xvnc server error. Root cause of 2148 is that certain Medley sessions in loadups run very quickly - less that a second or 2. This causes the medley script to improperly detect an Xvnc server error. Fixed by adding a cli flag --automation that forces the medley script to skip the check for Xvnc server errors. Changed loadup script to call medley with this flag set. Also add a cl flag to loadup --forcevnc that forces loadup to use vnc even on WSL2. This is intended for testing purposes only. --- docs/man-page/man_medley.html | 9 +++++++++ docs/man-page/medley.1 | 9 +++++++++ docs/man-page/medley.1.gz | Bin 5066 -> 5242 bytes docs/man-page/medley.1.md | 9 +++++++-- scripts/loadups/loadup | 5 +++++ scripts/loadups/loadup-setup.sh | 3 +++ scripts/medley/medley.command | 8 +++++++- scripts/medley/medley_args.sh | 4 ++++ scripts/medley/medley_usage.sh | 2 ++ scripts/medley/medley_vnc.sh | 2 +- 10 files changed, 47 insertions(+), 4 deletions(-) diff --git a/docs/man-page/man_medley.html b/docs/man-page/man_medley.html index e75ac6be..a0e6c58a 100644 --- a/docs/man-page/man_medley.html +++ b/docs/man-page/man_medley.html @@ -284,6 +284,15 @@ environment variable LDEREPEATCM.

On Windows/Cygwin installations, FILE is specified in the Medley file system, not the host Windows file system.

+
-am, –automation
+
+

Useful only when using –vnc (and always on WSL1). When calling medley +as part of an automation script, often Medley will run for a very short +time (< a couple of seconds). This can cause issues with medley code +that detects Xvnc server failures. Setting this flag notifies Medley +that very short Medley sessions are possible and the Xvnc error +detection needs to be adjusted accordingly.

+

Other Options

diff --git a/docs/man-page/medley.1 b/docs/man-page/medley.1 index c2da6a5d..c73c1f9c 100644 --- a/docs/man-page/medley.1 +++ b/docs/man-page/medley.1 @@ -386,6 +386,15 @@ environment variable LDEREPEATCM. On Windows/Cygwin installations, \f[I]FILE\f[R] is specified in the Medley file system, not the host Windows file system. .RE +.TP +-am, \[en]automation +Useful only when using \[en]vnc (and always on WSL1). +When calling medley as part of an automation script, often Medley will +run for a very short time (< a couple of seconds). +This can cause issues with medley code that detects Xvnc server +failures. +Setting this flag notifies Medley that very short Medley sessions are +possible and the Xvnc error detection needs to be adjusted accordingly. .SS Other Options .PP \ diff --git a/docs/man-page/medley.1.gz b/docs/man-page/medley.1.gz index 4e563a85f4d0176e3502e746c4325fef5ac879d8..95dd0cf33f63760b6aced25bfd47a659cb027fbf 100644 GIT binary patch literal 5242 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 A)c^nh literal 5066 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 diff --git a/docs/man-page/medley.1.md b/docs/man-page/medley.1.md index 28215964..425e6a30 100644 --- a/docs/man-page/medley.1.md +++ b/docs/man-page/medley.1.md @@ -216,7 +216,7 @@ specified in the Medley file system, not the host Windows file system. If the given value is "-", Medley will start up without using REM.CM file. There is no default Medley REM.CM file. - + On Windows/Cygwin installations, *FILE* is specified in the Medley file system, not the host Windows file system. @@ -254,10 +254,15 @@ for the parameter will be reset to the default value - which in the case of *Hos -cc \[*FILE* | -], \-\-repeat \[*FILE* | -] : Run Medley once. And then as long as *FILE* exists and is greater then zero length, repeatedly run Medley using *FILE* as the REM.CM file that Medley reads and executes at startup. Each run of Medley can change the contents of *FILE* to effect the subsequent run of Medley. To end the cycle, Medley needs to delete *FILE*. WIthin Medley, *FILE* can be found as the value of the environment variable LDEREPEATCM. - + On Windows/Cygwin installations, *FILE* is specified in the Medley file system, not the host Windows file system. +-am, --automation +: Useful only when using --vnc (and always on WSL1). When calling medley as part of an automation script, often Medley +will run for a very short time (< a couple of seconds). This can cause issues with medley code that detects Xvnc server failures. +Setting this flag notifies Medley that very short Medley sessions are possible and the Xvnc error detection needs to be adjusted accordingly. + Other Options ------------- diff --git a/scripts/loadups/loadup b/scripts/loadups/loadup index 631a7d16..ab84791e 100755 --- a/scripts/loadups/loadup +++ b/scripts/loadups/loadup @@ -157,6 +157,11 @@ main() { # internal noendmsg=true ;; + --forcevnc) + # internal - for testing + # WSL only -otherwise warning msg from medley + force_vnc="+" + ;; -z | -man | --man ) if [ "$(uname)" = "Darwin" ] then diff --git a/scripts/loadups/loadup-setup.sh b/scripts/loadups/loadup-setup.sh index 47b0ba1a..0177dd08 100644 --- a/scripts/loadups/loadup-setup.sh +++ b/scripts/loadups/loadup-setup.sh @@ -161,6 +161,7 @@ loadup_finish () { exit ${exit_code} } +force_vnc="-" run_medley () { /bin/sh "${MEDLEYDIR}/scripts/medley/medley.command" \ --config - \ @@ -171,6 +172,8 @@ run_medley () { --rem.cm "${cmfile}" \ --greet "${initfile}" \ --sysout "$1" \ + --automation \ + --vnc "${force_vnc}" \ "$2" "$3" "$4" "$5" "$6" "$7" ; exit_code=$? } diff --git a/scripts/medley/medley.command b/scripts/medley/medley.command index 28ce293f..70a659b0 100755 --- a/scripts/medley/medley.command +++ b/scripts/medley/medley.command @@ -586,6 +586,8 @@ flags: -x - | --logindir - : use MEDLEYDIR/logindir as LOGINDIR in Medley + -am | --automation : this call to medley is being used in automation, adjust timings. Relevant in -vnc case only. + -cm FILE | --rem.cm FILE : use FILE as the REM.CM when starting up Medley. FILE must be absolute pathname. -cm - | --rem.cm - : do not use an REM.CM. Negate any prior setting, e.g., from config file. @@ -638,6 +640,7 @@ pixelscale_arg="" borderwidth_arg="" remcm_arg="${LDEREMCM}" repeat_cm="" +automation=false # Add marker at end of args so we can accumulate pass-on args in args array set -- "$@" "--start_of_pass_args" @@ -915,6 +918,9 @@ do fi exit 0 ;; + -am | --automation) + automation=true + ;; -nf | -NF | --nofork) # for use in loadups case $2 in @@ -1702,7 +1708,7 @@ do "$(ip_addr)":"${VNC_PORT}" \ >>"${LOG}" 2>&1 & wait $! - if [ $(( $(date +%s) - start_time )) -lt 5 ] + if [ "${automation}" = false ] && [ $(( $(date +%s) - start_time )) -lt 5 ] then if [ -z "$(pgrep -f "Xvnc ${DISPLAY}")" ] then diff --git a/scripts/medley/medley_args.sh b/scripts/medley/medley_args.sh index eac7baa0..2c3ec04d 100755 --- a/scripts/medley/medley_args.sh +++ b/scripts/medley/medley_args.sh @@ -48,6 +48,7 @@ pixelscale_arg="" borderwidth_arg="" remcm_arg="${LDEREMCM}" repeat_cm="" +automation=false # Add marker at end of args so we can accumulate pass-on args in args array set -- "$@" "--start_of_pass_args" @@ -325,6 +326,9 @@ do fi exit 0 ;; + -am | --automation) + automation=true + ;; -nf | -NF | --nofork) # for use in loadups case $2 in diff --git a/scripts/medley/medley_usage.sh b/scripts/medley/medley_usage.sh index e241ab16..a0346f91 100644 --- a/scripts/medley/medley_usage.sh +++ b/scripts/medley/medley_usage.sh @@ -115,6 +115,8 @@ flags: -x - | --logindir - : use MEDLEYDIR/logindir as LOGINDIR in Medley + -am | --automation : this call to medley is being used in automation, adjust timings. Relevant in -vnc case only. + -cm FILE | --rem.cm FILE : use FILE as the REM.CM when starting up Medley. FILE must be absolute pathname. -cm - | --rem.cm - : do not use an REM.CM. Negate any prior setting, e.g., from config file. diff --git a/scripts/medley/medley_vnc.sh b/scripts/medley/medley_vnc.sh index b578f859..df4f5fb4 100755 --- a/scripts/medley/medley_vnc.sh +++ b/scripts/medley/medley_vnc.sh @@ -215,7 +215,7 @@ "$(ip_addr)":"${VNC_PORT}" \ >>"${LOG}" 2>&1 & wait $! - if [ $(( $(date +%s) - start_time )) -lt 5 ] + if [ "${automation}" = false ] && [ $(( $(date +%s) - start_time )) -lt 5 ] then if [ -z "$(pgrep -f "Xvnc ${DISPLAY}")" ] then