Skip to content

Log any errors before cancel_init() (backport #5530)#5546

Merged
EugenioCollado merged 2 commits into2.14.xfrom
mergify/bp/2.14.x/pr-5530
Jan 14, 2025
Merged

Log any errors before cancel_init() (backport #5530)#5546
EugenioCollado merged 2 commits into2.14.xfrom
mergify/bp/2.14.x/pr-5530

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jan 8, 2025

This PR improves the debugging process by adding a proper logging right before running SecurityManager::cancel_init() in this catch block

Description

More details in this ticket #5531

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Fixes #(issue)

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • NA Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • NA Any new/modified methods have been properly documented using Doxygen.

  • NA Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • NA New feature has been added to the versions.md file (if applicable).

  • NA New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • NA Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5530 done by [Mergify](https://mergify.com).

* Log any errors before cancel_init()

Signed-off-by: Santti4go <santiaupi@gmail.com>

* Code style

Signed-off-by: Santti4go <santiaupi@gmail.com>

* Apply suggestion

Signed-off-by: Santti4go <santiaupi@gmail.com>

---------

Signed-off-by: Santti4go <santiaupi@gmail.com>
(cherry picked from commit 165d64e)
* Regression tests

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Update log macro

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Uncrustify

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Fix CI log flush

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

---------

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
@EugenioCollado
Copy link
Copy Markdown
Contributor

Backported commit 25b117fcf

@EugenioCollado EugenioCollado added this to the v2.14.5 milestone Jan 13, 2025
@EugenioCollado
Copy link
Copy Markdown
Contributor

@Mergifyio rebase

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jan 13, 2025

rebase

✅ Nothing to do for rebase action

@EugenioCollado EugenioCollado self-requested a review January 13, 2025 06:50
@github-actions github-actions bot added the ci-pending PR which CI is running label Jan 13, 2025
Copy link
Copy Markdown
Contributor

@EugenioCollado EugenioCollado left a comment

Choose a reason for hiding this comment

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

LGTM

@EugenioCollado EugenioCollado merged commit dbfd1f3 into 2.14.x Jan 14, 2025
@EugenioCollado EugenioCollado deleted the mergify/bp/2.14.x/pr-5530 branch January 14, 2025 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants