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

fixups from code review

Browse Source 
Revert "close raft long-lived connections"

This reverts commit 3ffda28206fcb3d63ad117fd1d27ae6f832b6625.

reload raft connections on changing tls
This commit is contained in:
Chelsea Holland Komlo
2017-11-27 11:42:52 -05:00
parent 156297c5ee
commit d4754d541b
5 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
command/agent/command.go
View File

@@ -12,6 +12,7 @@ import (
"sort"
"strconv"
"strings"
"sync"
"syscall"
"time"
@@ -46,6 +47,7 @@ type Command struct {
args []string
agent *Agent
httpServer *HTTPServer
httpServerLock sync.Mutex
logFilter *logutils.LevelFilter
logOutput io.Writer
retryJoinErrCh chan struct{}
@@ -611,6 +613,8 @@ func (c *Command) reloadHTTPServerOnConfigChange(newConfig *Config) error {
if err != nil {
return err
}
c.httpServerLock.Lock()
defer c.httpServerLock.Unlock()
c.httpServer = http
return nil
@@ -644,23 +648,14 @@ func (c *Command) handleReload() {
err := reloadFunc(newConf)
if err != nil {
c.agent.logger.Printf("[ERR] agent: failed to reload the config: %v", err)
}
err = c.httpServer.Shutdown()
if err != nil {
c.agent.logger.Printf("[ERR] agent: failed to stop HTTP server: %v", err)
return
}
// Wait some time to ensure a clean shutdown
time.Sleep(5 * time.Second)
http, err := NewHTTPServer(c.agent, c.agent.config)
err = c.reloadHTTPServerOnConfigChange(newConf)
if err != nil {
c.agent.logger.Printf("[ERR] agent: failed to reload http server: %v", err)
c.agent.logger.Printf("[ERR] agent: failed to reload the config: %v", err)
return
}
c.agent.logger.Println("[INFO] agent: successfully restarted the HTTP server")
c.httpServer = http
}
if s := c.agent.Server(); s != nil {