plugin start / catching panics / recover (#720)

Signed-off-by: David Chung <[email protected]>

Author: David Chung

cmd/infrakit/plugin/plugin.go

@@ -139,7 +139,7 @@ func Command(plugins func() discovery.Plugins) *cobra.Command {
 	}
 
 	configURL := start.Flags().String("config-url", "", "URL for the startup configs")
-	mustAll := start.Flags().Bool("all", true, "Panic if any plugin fails to start")
+	mustAll := start.Flags().Bool("all", false, "Panic if any plugin fails to start")
 	templateFlags, toJSON, _, processTemplate := base.TemplateProcessor(plugins)
 	start.Flags().AddFlagSet(templateFlags)
 
@@ -175,7 +175,15 @@ func Command(plugins func() discovery.Plugins) *cobra.Command {
 		if err != nil {
 			return err
 		}
-		defer pluginManager.Stop()
+		defer func() {
+			if r := recover(); r != nil {
+				log.Error("Error occurred. Recovered but exiting.", "err", r)
+				pluginManager.TerminateRunning()
+			}
+			pluginManager.WaitForAllShutdown()
+			log.Info("All plugins shutdown")
+			pluginManager.Stop()
+		}()
 
 		if len(args) == 0 {
 
@@ -228,9 +236,6 @@ func Command(plugins func() discovery.Plugins) *cobra.Command {
 
 		log.Info("Done waiting on plugin starts")
 
-		pluginManager.WaitForAllShutdown()
-		log.Info("All plugins shutdown")
-
 		return nil
 	}
 

pkg/cli/v0/event/cmd.go

@@ -15,7 +15,8 @@ var log = logutil.New("module", "cli/v1/event")
 func init() {
 	cli.Register(event.InterfaceSpec,
 		[]cli.CmdBuilder{
-			Event,
+			Ls,
+			Tail,
 		})
 }
 

pkg/cli/v0/event/ls.go

@@ -14,8 +14,8 @@ import (
 func Ls(name string, services *cli.Services) *cobra.Command {
 
 	ls := &cobra.Command{
-		Use:   "ls",
-		Short: "List event",
+		Use:   "topics",
+		Short: "List event topics",
 	}
 
 	long := ls.Flags().BoolP("long", "l", false, "Print full path")

pkg/cli/v0/metadata/cmd.go

@@ -13,13 +13,24 @@ import (
 var log = logutil.New("module", "cli/v1/metadata")
 
 func init() {
+	// cli.Register(metadata.InterfaceSpec,
+	// 	[]cli.CmdBuilder{
+	// 		Metadata,
+	// 	})
+	// cli.Register(metadata.UpdatableInterfaceSpec,
+	// 	[]cli.CmdBuilder{
+	// 		Updatable,
+	// 	})
 	cli.Register(metadata.InterfaceSpec,
 		[]cli.CmdBuilder{
-			Metadata,
+			Ls,
+			Cat,
 		})
 	cli.Register(metadata.UpdatableInterfaceSpec,
 		[]cli.CmdBuilder{
-			Updatable,
+			Ls,
+			Cat,
+			Change,
 		})
 }
 

pkg/cli/v0/metadata/ls.go

@@ -15,7 +15,7 @@ import (
 func Ls(name string, services *cli.Services) *cobra.Command {
 
 	ls := &cobra.Command{
-		Use:   "ls",
+		Use:   "vars",
 		Short: "List metadata",
 	}
 

pkg/run/manager/manager.go

@@ -32,6 +32,7 @@ func ManagePlugins(rules []launch.Rule,
 		plugins:      plugins,
 		mustAll:      mustAll,
 		scanInterval: scanInterval,
+		running:      []string{},
 	}
 	return m, m.Start(rules)
 }
@@ -51,13 +52,20 @@ type Manager struct {
 	wgStartAll  sync.WaitGroup
 	started     chan plugin.Name
 	lock        sync.RWMutex
+
+	running []string // lookups of those started
 }
 
 // Rules returns a list of plugins that can be launched via this manager
 func (m *Manager) Rules() []launch.Rule {
 	return m.rules
 }
 
+// TerminateRunning terminates those that have been started.
+func (m *Manager) TerminateRunning() error {
+	return m.Terminate(m.running)
+}
+
 // Terminate stops the plugins.  Note this is accomplished by sending a signal TERM to the
 // process found at the lookup.pid file.  For inproc plugins, this will effectively kill
 // all the plugins that run in that process.
@@ -228,6 +236,8 @@ func (m *Manager) WaitForAllShutdown() {
 
 			lookup, _ := target.GetLookupAndType()
 
+			m.running = append(m.running, lookup)
+
 			if _, has := seen[lookup]; !has {
 				log.Debug("Start watching", "lookup", lookup)
 				targets = append(targets, lookup)