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

NMS-16518: Fix scriptd's broken reloadDaemonConfig handling #7427

Merged
merged 5 commits into from
Sep 16, 2024

Conversation

dino2gnt
Copy link
Contributor

@dino2gnt dino2gnt commented Sep 14, 2024

Since NMS-13216, the logic to handle reloadDaemonConfig events in Scriptd has been broken. In attempting to fix it, I also realized that Scriptd's previous behavior was also broken in that it would not refresh scripts referenced in the config that had been modified on reloadDaemonConfig. Restore the previous handling of the reloadDaemonConfig event, and change Scriptd destroy and re-register the defined BSF engines entirely, which causes Scriptd to re-read and re-source all referenced scripts.

All Contributors

Contribution Checklist

  • Please make an issue in the OpenNMS issue tracker if there isn't one already.
    Once there is an issue, please:
    1. update the title of this PR to be in the format: ${JIRA-ISSUE-NUMBER}: subject of pull request
    2. update the Jira link at the bottom of this comment to refer to the real issue number
    3. prefix your commit messages with the issue number, if possible
    4. once you've created this PR, please link to it in a comment in the Jira issue
      Don't worry if this sounds like a lot, we can help you get things set up properly.
  • If this code is likely to affect the UI, did you name your branch with -smoke in it to trigger smoke tests?
  • If this is a new or updated feature, is there documentation for the new behavior?
  • If this is new code, are there unit and/or integration tests?
  • If this PR targets a foundation-* branch, does it try to avoid changing files in $OPENNMS_HOME/etc/?

What's Next?

A PR should be assigned at least 2 reviewers. If you know that someone would be a good person to review your code, feel free to add them.

If you need help making additions or changes to the documentation related to your changes, please let us know.

In any case, if anything is unclear or you want help getting your PR ready for merge, please don't hesitate to say something in the comments here,
or in the #opennms-development chat channel.

Once reviewer(s) accept the PR and the branch passes continuous integration, the PR is eligible for merge.

At that time, if you have commit access (are an OpenNMS Group employee or a member of the OGP) you are welcome to merge the PR when you're ready.
Otherwise, a reviewer can merge it for you.

Thanks for taking time to contribute!

External References

Copy link
Contributor

@christianpape christianpape left a comment

Choose a reason for hiding this comment

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

Only a few minor things to do.

dino2gnt and others added 4 commits September 16, 2024 07:41
…utor.java

Co-authored-by: Christian Pape <Christian.Pape@informatik.hs-fulda.de>
…utor.java

Co-authored-by: Christian Pape <Christian.Pape@informatik.hs-fulda.de>
…utor.java

Co-authored-by: Christian Pape <Christian.Pape@informatik.hs-fulda.de>
…utor.java

Co-authored-by: Christian Pape <Christian.Pape@informatik.hs-fulda.de>
Copy link
Contributor

@christianpape christianpape left a comment

Choose a reason for hiding this comment

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

LGTM.

@dino2gnt dino2gnt merged commit a57deaf into develop Sep 16, 2024
13 of 16 checks passed
@dino2gnt dino2gnt deleted the dcy/FixScriptdReloads branch September 16, 2024 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants