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.

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

fix: handle interface error during report timeout (backport #25893) #25894

Merged
merged 2 commits into from
Apr 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 10, 2024

During large reports it's possible that mysql connection gets dropped, in that case we should still ensure that errors get logged.


This is an automatic backport of pull request #25893 done by Mergify.

(cherry picked from commit c1bf152)

# Conflicts:
#	frappe/core/doctype/prepared_report/prepared_report.py
#	frappe/database/postgres/database.py
@mergify mergify bot requested a review from a team April 10, 2024 06:59
@mergify mergify bot added the conflicts label Apr 10, 2024
@mergify mergify bot requested review from ankush and removed request for a team April 10, 2024 06:59
Copy link
Contributor Author

mergify bot commented Apr 10, 2024

Cherry-pick of c1bf152 has failed:

On branch mergify/bp/version-14-hotfix/pr-25893
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit c1bf152b89.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/database/database.py
	modified:   frappe/database/mariadb/database.py
	modified:   frappe/database/utils.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/prepared_report/prepared_report.py
	both modified:   frappe/database/postgres/database.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot assigned ankush Apr 10, 2024
@ankush ankush enabled auto-merge (squash) April 12, 2024 08:13
@ankush ankush removed the conflicts label Apr 12, 2024
@ankush ankush merged commit 5d4e106 into version-14-hotfix Apr 12, 2024
10 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-25893 branch April 12, 2024 09:28
frappe-pr-bot pushed a commit that referenced this pull request Apr 16, 2024
# [14.72.0](v14.71.0...v14.72.0) (2024-04-16)

### Bug Fixes

* handle empty style tag ([#25910](#25910)) ([#25915](#25915)) ([771fa80](771fa80))
* handle interface error during report timeout ([#25893](#25893)) ([#25894](#25894)) ([5d4e106](5d4e106))
* make letterhead attachments public by default (backport [#25925](#25925)) ([#25926](#25926)) ([6ea38b6](6ea38b6))
* make_error_msg for imap ([b2cfa49](b2cfa49))

### Features

* add option to set default email recipients ([#25555](#25555)) ([dc070a4](dc070a4))
* allow wildcard for doctype in permission hooks ([#25729](#25729)) ([#25891](#25891)) ([af33091](af33091))
* **Customize Form:** add "Trim Table" action (backport [#25923](#25923)) ([#25934](#25934)) ([ad34d52](ad34d52))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.72.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants