change: clean code

plugin/common/init.go

@@ -148,7 +148,7 @@ func Init(path string) (Plugin, error) {
 	}
 	var plugin Plugin
 
-	// priority: hashicorp plugin > go plugin > builtin functions
+	// priority: hashicorp plugin > go plugin
 	// locate hashicorp plugin file
 	pluginPath, err := locateFile(path, hashicorpGoPluginFile)
 	if err == nil {

runner.go

@@ -193,19 +193,27 @@ func (r *caseRunner) run() error {
 }
 
 func initPlugin(path string) (plugin common.Plugin, err error) {
-	defer func() {
+	plugin, err = common.Init(path)
 	if plugin == nil {
 		return
 	}
 
+	// catch Interrupt and SIGTERM signals to ensure plugin quitted
+	c := make(chan os.Signal)
+	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+	go func() {
+		<-c
+		plugin.Quit()
+		os.Exit(1)
+	}()
+
+	// report event for initializing plugin
 	var pluginType string
 	if _, ok := plugin.(*common.GoPlugin); ok {
 		pluginType = "go"
 	} else {
 		pluginType = "hashicorp"
 	}
-
-		// report event for initializing plugin
 	event := ga.EventTracking{
 		Category: "InitPlugin",
 		Action:   fmt.Sprintf("Init %s plugin", pluginType),
@@ -214,19 +222,6 @@ func initPlugin(path string) (plugin common.Plugin, err error) {
 		event.Value = 1 // failed
 	}
 	go ga.SendEvent(event)
-	}()
-	plugin, err = common.Init(path)
-
-	// catch Interrupt and SIGTERM signals to ensure plugin quitted
-	c := make(chan os.Signal)
-	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-	go func() {
-		<-c
-		if plugin != nil {
-			plugin.Quit()
-		}
-		os.Exit(1)
-	}()
 
 	return
 }