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

reload service registration configuration on SIGHUP #17598

Merged
merged 10 commits into from
May 9, 2024
Merged

reload service registration configuration on SIGHUP #17598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8d013b4
add reloading service configuration
kevinschoonover Oct 19, 2022
3df1b36
add changelog entry
kevinschoonover Apr 24, 2024
7c06b1c
add tests
kevinschoonover Apr 24, 2024
0f8821d
fix typo
kevinschoonover Apr 24, 2024
2718c23
check if config.ServiceRegistration is nil before signaling
kevinschoonover May 6, 2024
023158d
add changes for deregistering service on nil config with failing tests
kevinschoonover May 7, 2024
dbe9ce9
fix tests by decreasing reconcile_timeout + setting consul agent tokens
kevinschoonover May 7, 2024
9cc3572
fix races
kevinschoonover May 7, 2024
33fbc46
add comments in test
kevinschoonover May 7, 2024
929bfd8
Merge branch 'main' into kschoon/reload-service-registration
May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/17598.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
core/config: reload service registration configuration on SIGHUP
```
9 changes: 9 additions & 0 deletions command/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,6 +1685,15 @@ func (c *ServerCommand) Run(args []string) int {
}
}

// notify ServiceRegistration that a configuration reload has occurred
if sr := coreConfig.GetServiceRegistration(); sr != nil {
var srConfig *map[string]string
if config.ServiceRegistration != nil {
srConfig = &config.ServiceRegistration.Config
}
sr.NotifyConfigurationReload(srConfig)
}

if err := core.ReloadCensus(); err != nil {
c.UI.Error(err.Error())
}
Expand Down
Loading
Loading