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

nixos/phoebus-alarm-logger: forward configuration to SpringBoot #141

Conversation

minijackson
Copy link
Collaborator

phoebus-alarm-logger does not forward the given configuration to SpringBoot, so we use an environment variable to forward it ourselves.

this caused options like "server.port" to be ignored, since they are SpringBoto specific.

Use the "server.port" option in the test to test regressions.

fixes #56

phoebus-alarm-logger does not forward the given configuration to
SpringBoot, so we use an environment variable to forward it ourselves.

this caused options like "server.port" to be ignored, since they are
SpringBoto specific.

Use the "server.port" option in the test to test regressions.

fixes epics-extensions#56
@minijackson minijackson added backport nixos-23.11 Backport pull request to the nixos-23.11 branch backport nixos-23.05 Backport pull request to the nixos-23.05 branch backport nixos-24.05 Backport pull request to the nixos-24.05 branch labels Aug 6, 2024
Copy link
Collaborator

@stephane-cea stephane-cea left a comment

Choose a reason for hiding this comment

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

Looks good to me! Thanks for the fix!

@minijackson minijackson merged commit 09806d1 into epics-extensions:master Sep 3, 2024
5 checks passed
@minijackson minijackson deleted the fix-alarm-logger-springboot-config branch September 3, 2024 09:25
Copy link
Contributor

github-actions bot commented Sep 3, 2024

Successfully created backport PR for nixos-23.11:

Copy link
Contributor

github-actions bot commented Sep 3, 2024

Backport failed for nixos-23.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin nixos-23.05
git worktree add -d .worktree/backport/141-to-nixos-23.05 origin/nixos-23.05
cd .worktree/backport/141-to-nixos-23.05
git switch --create backport/141-to-nixos-23.05
git cherry-pick -x cc2d3f67db8f4cc00407d8bf7a0f46fbcc47b9f0

Copy link
Contributor

github-actions bot commented Sep 3, 2024

Successfully created backport PR for nixos-24.05:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport nixos-23.05 Backport pull request to the nixos-23.05 branch backport nixos-23.11 Backport pull request to the nixos-23.11 branch backport nixos-24.05 Backport pull request to the nixos-24.05 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Alarm logger "server.port" setting is not taken into account
2 participants