kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 10:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix client reloading and pass the plugin loaders to server and client

Browse Source
This commit is contained in:
Alex Dadgar
2018-09-26 18:14:36 -07:00
committed by Michael Schurter
parent 7882ae4a1f
commit e2553a13d4
9 changed files with 251 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
command/agent/command.go
View File

@@ -751,25 +751,36 @@ func (c *Command) handleReload() {
if s := c.agent.Server(); s != nil {
c.agent.logger.Debug("starting reload of server config")
sconf, err := convertServerConfig(newConf, c.agent.logger, c.logOutput)
sconf, err := convertServerConfig(newConf)
if err != nil {
c.agent.logger.Error("failed to convert server config", "error", err)
return
} else {
if err := s.Reload(sconf); err != nil {
c.agent.logger.Error("reloading server config failed", "error", err)
return
}
}
// Finalize the config to get the agent objects injected in
c.agent.finalizeServerConfig(sconf)
// Reload the config
if err := s.Reload(sconf); err != nil {
c.agent.logger.Error("reloading server config failed", "error", err)
return
}
}
if s := c.agent.Client(); s != nil {
clientConfig, err := c.agent.clientConfig()
c.agent.logger.Debug("starting reload of client config")
clientConfig, err := convertClientConfig(newConf)
if err != nil {
c.agent.logger.Error("reloading client config failed", "error", err)
c.agent.logger.Error("failed to convert client config", "error", err)
return
}
// Finalize the config to get the agent objects injected in
if err := c.agent.finalizeClientConfig(clientConfig); err != nil {
c.agent.logger.Error("failed to finalize client config", "error", err)
return
}
if err := c.agent.Client().Reload(clientConfig); err != nil {
c.agent.logger.Error("reloading client config failed", "error", err)
return