Initial worker porting steps (#232)
This commit is contained in:
1 parent
73a38b1433
commit
203e2b5dc2
41 files changed
+2462
-645
No files matched your search
@@ -238,6 +238,8 @@ func (c *Command) Run(args []string) int {
|
||||
foundCluster = true
|
||||
case "api":
|
||||
foundAPI = true
|
||||
case "worker-alpn-tls":
|
||||
// Do nothing, in a dev mode we might see it here
|
||||
default:
|
||||
c.UI.Error(fmt.Sprintf("Unknown listener purpose %q", lnConfig.Purpose[0]))
|
||||
return 1
|
||||
@@ -264,7 +266,7 @@ func (c *Command) Run(args []string) int {
|
||||
c.UI.Error("No listener marked for cluster purpose found, but listener explicitly marked for api was found")
|
||||
return 1
|
||||
}
|
||||
if err := c.SetupListeners(c.UI, c.Config.SharedConfig); err != nil {
|
||||
if err := c.SetupListeners(c.UI, c.Config.SharedConfig, []string{"api", "cluster"}); err != nil {
|
||||
c.UI.Error(err.Error())
|
||||
return 1
|
||||
}
|
||||
@@ -351,7 +353,11 @@ func (c *Command) ParseFlagsAndConfig(args []string) int {
|
||||
}
|
||||
|
||||
} else {
|
||||
c.Config, err = config.DevController()
|
||||
if len(c.flagConfig) == 0 {
|
||||
c.Config, err = config.DevController()
|
||||
} else {
|
||||
c.Config, err = config.LoadFile(c.flagConfig, c.configKMS)
|
||||
}
|
||||
if err != nil {
|
||||
c.UI.Error(fmt.Errorf("Error creating dev config: %w", err).Error())
|
||||
return 1
|
||||
@@ -430,7 +436,7 @@ func (c *Command) Start() error {
|
||||
|
||||
if err := c.controller.Start(); err != nil {
|
||||
retErr := fmt.Errorf("Error starting controller: %w", err)
|
||||
if err := c.controller.Shutdown(); err != nil {
|
||||
if err := c.controller.Shutdown(false); err != nil {
|
||||
c.UI.Error(retErr.Error())
|
||||
retErr = fmt.Errorf("Error with controller shutdown: %w", err)
|
||||
}
|
||||
@@ -454,7 +460,7 @@ func (c *Command) WaitForInterrupt() int {
|
||||
case <-shutdownCh:
|
||||
c.UI.Output("==> Boundary controller shutdown triggered")
|
||||
|
||||
if err := c.controller.Shutdown(); err != nil {
|
||||
if err := c.controller.Shutdown(false); err != nil {
|
||||
c.UI.Error(fmt.Errorf("Error with controller shutdown: %w", err).Error())
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user