diff --git a/ChangeLog.md b/ChangeLog.md index 060bdcf8..48743c1c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,60 +1,54 @@ This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first). --- -Release 4.1.6-rc3 +Release 4.1.6 === We might have finally found the cause of the application hangs during shutdown. -Note that this became easier to track down due to the current (2021-01-11) -downtime for migration of www.edsm.net. EDMarketConnector will hang during -shutdown prior to this version whilst EDSM isn't available. +Note that this became easier to track down due to the downtime +for migration of www.edsm.net around 2021-01-11. Before these fixes EDSM's +API not being available would cause an EDMC hang on shutdown. -* Avoid making Tk event_generate() calls whilst the appliction is shutting - down. - -* Plugins should actively avoid making any sort of Tk event_generate() call - during application shutdown. - - This means using `if not config.shutting_down:` to gate any code in worker - threads that might attempt this. Also, be sure you're not attempting such - in your `plugin_stop()` function. - - See plugins/edsm.py and plugins/inara.py for example of the usage. - -* Any use of plug.show_error() won't actually change the UI status line during - shutdown, but the text you tried to show will be logged instead. - -Release 4.1.6-rc2 -=== - -* We've applied extra paranoia to some of the application shutdown code to +* We've applied extra paranoia to some of the application shutdown code to ensure we're not still trying to handle journal events during this sequence. - + We also re-ordered the shutdown sequence, which might help avoid the shutdown hang. - + If you encounter a shutdown hang then please add a comment and log files to [Application can leave a zombie process on shutdown #678](https://github.com/EDCD/EDMarketConnector/issues/678) to help us track down the cause and fix it. +* We now avoid making Tk event_generate() calls whilst the appliction is + shutting down. -* Logging from any name-mangled method should now work properly. +* Plugins should actively avoid making any sort of Tk event_generate() call + during application shutdown. -Release 4.1.6-rc1 -=== + This means using `if not config.shutting_down:` to gate any code in worker + threads that might attempt this. Also, be sure you're not attempting such + in your `plugin_stop()` function. + + See plugins/edsm.py and plugins/inara.py for example of the usage. + +* Any use of `plug.show_error()` won't actually change the UI status line + during shutdown, but the text you tried to show will be logged instead. * Cargo tracking will now correctly count all instances of the same type of cargo for different missions. Previously it only counted the cargo for the last mission requiring that cargo type, as found in Cargo.json. * The loaded contents of Cargo.json can now be found in `monitor.state['CargoJSON']`. - `monitor.state` is what is passed to plugins as `state` in the + `monitor.state` is what is passed to plugins as `state` in the `journal_entry()` call. * Our logging code should now cope with logging from a property. +* Logging from any name-mangled method should now work properly. + * Miscellaneous updates to PLUGINS.md - mostly to clarify some things. + Release 4.1.5 === diff --git a/config.py b/config.py index 695fda23..41d56f3f 100644 --- a/config.py +++ b/config.py @@ -13,7 +13,7 @@ appcmdname = 'EDMC' # appversion **MUST** follow Semantic Versioning rules: # # Major.Minor.Patch(-prerelease)(+buildmetadata) -appversion = '4.1.6-rc3' #-rc1+a872b5f' +appversion = '4.1.6' #-rc1+a872b5f' # For some things we want appversion without (possible) +build metadata appversion_nobuild = str(semantic_version.Version(appversion).truncate('prerelease')) copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD'