Fixes #1618

- Fix plugin load timeout in LoadPlugin and startPlugin by blocking until receiving plugin's response or timeout expiry
intelsdi-x · May 12, 2017 · cb68359 · cb68359
1 parent 3addb66
commit cb68359
Show file tree

Hide file tree

Showing 6 changed files with 374 additions and 299 deletions.
diff --git a/control/control.go b/control/control.go
@@ -116,6 +116,7 @@ type runsPlugins interface {
 	SetPluginManager(managesPlugins)
 	Monitor() *monitor
 	runPlugin(string, *pluginDetails) error
+	SetPluginLoadTimeout(int)
 }
 
 type managesPlugins interface {
@@ -174,6 +175,7 @@ func OptSetConfig(cfg *Config) PluginControlOpt {
 		c.Config = cfg
 		c.pluginManager.SetPluginConfig(cfg.Plugins)
 		c.pluginManager.SetPluginLoadTimeout(c.Config.PluginLoadTimeout)
+		c.pluginRunner.SetPluginLoadTimeout(c.Config.PluginLoadTimeout)
 	}
 }