deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-07 21:23:34 +00:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fixed bug introduced in 6.62.01 that caused a trap that broke redirect csv ... multiprocess.

Browse Source
This commit is contained in:
Ross Scroggs
2023-08-08 16:20:12 -07:00
parent da43e5fc5b
commit cccc51283a
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/GamUpdates.md
View File

@ -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. 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 ### 6.62.01
Updated code so that when `gam.cfg` variables `csv_output_timestamp_column` and `output_timeformat` are both specified, Updated code so that when `gam.cfg` variables `csv_output_timestamp_column` and `output_timeformat` are both specified,

5
src/GamUpdate.txt
View File

@ -2,6 +2,11 @@
Merged GAM-Team version 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 6.62.01
Updated code so that when `gam.cfg` variables `csv_output_timestamp_column` and `output_timeformat` are both specified, Updated code so that when `gam.cfg` variables `csv_output_timestamp_column` and `output_timeformat` are both specified,

6
src/gam/__init__.py
View File

@ -9069,7 +9069,7 @@ def restoreNonPickleableValues(savedValues):
GM.Globals[GM.CMDLOG_HANDLER] = savedValues[GM.CMDLOG_HANDLER] GM.Globals[GM.CMDLOG_HANDLER] = savedValues[GM.CMDLOG_HANDLER]
GM.Globals[GM.CMDLOG_LOGGER] = savedValues[GM.CMDLOG_LOGGER] 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 global Cmd
def reopenSTDFile(stdtype): def reopenSTDFile(stdtype):
@ -9089,6 +9089,7 @@ def CSVFileQueueHandler(mpQueue, mpQueueStdout, mpQueueStderr, csvPF, datetimeNo
GM.Globals[GM.DATETIME_NOW] = datetimeNow GM.Globals[GM.DATETIME_NOW] = datetimeNow
GC.Values[GC.TIMEZONE] = tzinfo GC.Values[GC.TIMEZONE] = tzinfo
GC.Values[GC.OUTPUT_TIMEFORMAT] = output_timeformat
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
signal.signal(signal.SIGINT, signal.SIG_IGN) signal.signal(signal.SIGINT, signal.SIG_IGN)
if multiprocessing.get_start_method() == 'spawn': if multiprocessing.get_start_method() == 'spawn':
@ -9157,7 +9158,8 @@ def initializeCSVFileQueueHandler(mpManager, mpQueueStdout, mpQueueStderr):
mpQueueHandler = multiprocessing.Process(target=CSVFileQueueHandler, mpQueueHandler = multiprocessing.Process(target=CSVFileQueueHandler,
args=(mpQueue, mpQueueStdout, mpQueueStderr, args=(mpQueue, mpQueueStdout, mpQueueStderr,
GM.Globals[GM.CSVFILE][GM.REDIRECT_QUEUE_CSVPF], 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() mpQueueHandler.start()
return (mpQueue, mpQueueHandler) return (mpQueue, mpQueueHandler)