Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure all file handles to GeoIP databases are closed before replacing the file #17085

Merged
merged 1 commit into from Jan 17, 2021
Merged

Ensure all file handles to GeoIP databases are closed before replacing the file #17085

merged 1 commit into from Jan 17, 2021

Conversation

sgiehl
Copy link
Member

@sgiehl sgiehl commented Jan 13, 2021

Description:

fixes #17023

Review

  • Functional review done
  • Usability review done (is anything maybe unclear or think about anything that would cause people to reach out to support)
  • Security review done see checklist
  • Code review done
  • Tests were added if useful/possible
  • Reviewed for breaking changes
  • Developer changelog updated if needed
  • Documentation added if needed
  • Existing documentation updated if needed

@sgiehl sgiehl added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels Jan 13, 2021
@sgiehl sgiehl added this to the 4.2.0 milestone Jan 13, 2021
@sgiehl sgiehl mentioned this pull request Jan 13, 2021
Closed
diosmosis
diosmosis approved these changes Jan 14, 2021
View reviewed changes
Copy link
Member

@diosmosis diosmosis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code looks good, I would personally but the cleanup logic in a explicit method to close the file handles rather than rely on php calling __destruct (in case there ends up being a strange case where it doesn't get called), but I think it will work regardless.

@mstenz
Copy link

mstenz commented Jan 14, 2021

let me test the code and give you feedback

@mstenz
Copy link

mstenz commented Jan 14, 2021

it works for me.

@sgiehl
Copy link
Member Author

sgiehl commented Jan 14, 2021

@mstenz thanks for confirming

@diosmosis diosmosis merged commit 1a00b5a into 4.x-dev Jan 17, 2021
@diosmosis diosmosis deleted the geoipupdatewin branch January 17, 2021 02:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@diosmosis diosmosis diosmosis approved these changes

Assignees
No one assigned
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Milestone
4.2.0
Development

Successfully merging this pull request may close these issues.

Starting with php 7.3 on windows OS the geoip2php Update procedure is not working anymore.
3 participants
@sgiehl @mstenz @diosmosis