This combines the Ash'es work and mine into one #3
Conversation
This file contains 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
The build script now bakes the server version hash number in proxy.php that it is built against, such that the latter can use it to detect stale servers. After an upgrade, proxy.php will be running the newer version but, unless loolwsd is restarted, the server version returned in hosting/capabilities will be unexpected (i.e. will not match the one in proxy.php). When a mismatch is detected, proxy.php will kill the loolwsd process and start a new instance. Also replaced a number of tabs with spaces and fixed indentation issues to help readability and consistency.
Indicate that we are restarting the instance, so that the one checking the status can detect a restarting loop & disable. Also avoid a potential infinite loop in case other request started the loolwsd in the meantime.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Some cosmetic changes - split the reformatting and the actual code + some prevention of infinite looping...