Adds log capturing from plugins to be carried through to snapd's logs

control/available_plugin.go

@@ -79,7 +79,7 @@ type availablePlugin struct {
 
 // newAvailablePlugin returns an availablePlugin with information from a
 // plugin.Response
-func newAvailablePlugin(resp *plugin.Response, emitter gomit.Emitter, ep executablePlugin) (*availablePlugin, error) {
+func newAvailablePlugin(resp plugin.Response, emitter gomit.Emitter, ep executablePlugin) (*availablePlugin, error) {
 	if resp.Type != plugin.CollectorPluginType && resp.Type != plugin.ProcessorPluginType && resp.Type != plugin.PublisherPluginType {
 		return nil, strategy.ErrBadType
 	}

control/available_plugin_test.go

@@ -36,7 +36,7 @@ func TestAvailablePlugin(t *testing.T) {
 		Convey("returns an availablePlugin", func() {
 			ln, _ := net.Listen("tcp", ":4000")
 			defer ln.Close()
-			resp := &plugin.Response{
+			resp := plugin.Response{
 				Meta: plugin.PluginMeta{
 					Name:    "testPlugin",
 					Version: 1,
@@ -104,7 +104,7 @@ func TestAvailablePlugins(t *testing.T) {
 		})
 	})
 	Convey("it returns an error if client cannot be created", t, func() {
-		resp := &plugin.Response{
+		resp := plugin.Response{
 			Meta: plugin.PluginMeta{
 				Name:    "test",
 				Version: 1,

control/control.go

@@ -71,13 +71,10 @@ var (
 	ErrControllerNotStarted = errors.New("Must start Controller before use")
 )
 
-type executablePlugins []plugin.ExecutablePlugin
-
 type pluginControl struct {
 	// TODO, going to need coordination on changing of these
-	RunningPlugins executablePlugins
-	Started        bool
-	Config         *Config
+	Started bool
+	Config  *Config
 
 	autodiscoverPaths []string
 	eventManager      *gomit.EventController
@@ -361,9 +358,9 @@ func (p *pluginControl) Stop() {
 	}
 
 	// stop running plugins
-	for _, rp := range p.RunningPlugins {
+	for _, rp := range p.pluginRunner.AvailablePlugins().all() {
 		controlLogger.Debug("Stopping running plugin")
-		rp.Kill()
+		rp.Stop("daemon exiting")
 	}
 
 	// unload plugins