Fix initial import of settings file that has yet to be imported#800
Merged
isc-pbarton merged 3 commits intointersystems:mainfrom Jul 8, 2025
Merged
Conversation
raymond-rebbeck
force-pushed
the
settings-file-timestamp
branch
from
8d4c35a to
b95d83c
Compare
Contributor
Author
|
It's strange that a test case failed. It did not happen when I initially created this PR and all I've done is rebase this branch on main to pick up the 2.12.1 release changes. |
…has never been imported Returning the current time can prevent import of the settings file as it can prevent it from being considered outdated.
raymond-rebbeck
force-pushed
the
settings-file-timestamp
branch
from
b95d83c to
a14beb2
Compare
Contributor
Author
|
I rebased again and the test case succeeded again. I had a look through the relevant code and it was not immediately apparent how this might have been responsible for the failure. Perhaps there is some kind of race condition that coincidentally happened. |
isc-pbarton
approved these changes
Jul 8, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #794
Do not return the current time as a timestamp when the settings file has never been imported.
Returning the current time can prevent import of the settings file as it can prevent it from being considered outdated.
The comment of the timestamp message very much suggests to me that returning
""is the intended behaviour and that$zdatetime($horolog,3)is just a description of the format of the timestamp that would be returned if there was one.