diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 95b8ad3a..b925a2e7 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,11 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads) for Windows or other options, including manual installation. +### 6.62.02 + +Fixed bug introduced in 6.62.01 that caused a trap that broke `redirect csv ... multiprocess`. +My apologies. + ### 6.62.01 Updated code so that when `gam.cfg` variables `csv_output_timestamp_column` and `output_timeformat` are both specified, diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index f62d6325..0f7d3e53 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,11 @@ Merged GAM-Team version +6.62.02 + +Fixed bug introduced in 6.62.01 that caused a trap that broke `redirect csv ... multiprocess`. +My apologies. + 6.62.01 Updated code so that when `gam.cfg` variables `csv_output_timestamp_column` and `output_timeformat` are both specified, diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 99f889e5..3b217143 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -9069,7 +9069,7 @@ def restoreNonPickleableValues(savedValues): GM.Globals[GM.CMDLOG_HANDLER] = savedValues[GM.CMDLOG_HANDLER] GM.Globals[GM.CMDLOG_LOGGER] = savedValues[GM.CMDLOG_LOGGER] -def CSVFileQueueHandler(mpQueue, mpQueueStdout, mpQueueStderr, csvPF, datetimeNow, tzinfo): +def CSVFileQueueHandler(mpQueue, mpQueueStdout, mpQueueStderr, csvPF, datetimeNow, tzinfo, output_timeformat): global Cmd def reopenSTDFile(stdtype): @@ -9089,6 +9089,7 @@ def CSVFileQueueHandler(mpQueue, mpQueueStdout, mpQueueStderr, csvPF, datetimeNo GM.Globals[GM.DATETIME_NOW] = datetimeNow GC.Values[GC.TIMEZONE] = tzinfo + GC.Values[GC.OUTPUT_TIMEFORMAT] = output_timeformat if sys.platform.startswith('win'): signal.signal(signal.SIGINT, signal.SIG_IGN) if multiprocessing.get_start_method() == 'spawn': @@ -9157,7 +9158,8 @@ def initializeCSVFileQueueHandler(mpManager, mpQueueStdout, mpQueueStderr): mpQueueHandler = multiprocessing.Process(target=CSVFileQueueHandler, args=(mpQueue, mpQueueStdout, mpQueueStderr, GM.Globals[GM.CSVFILE][GM.REDIRECT_QUEUE_CSVPF], - GM.Globals[GM.DATETIME_NOW], GC.Values[GC.TIMEZONE])) + GM.Globals[GM.DATETIME_NOW], GC.Values[GC.TIMEZONE], + GC.Values[GC.OUTPUT_TIMEFORMAT])) mpQueueHandler.start() return (mpQueue, mpQueueHandler)