change: update logger name

Author: debugtalk

fungo/init.go

@@ -12,10 +12,11 @@ var (
 )
 
 var Logger = hclog.New(&hclog.LoggerOptions{
-	Name:   "fungo",
-	Output: hclog.DefaultOutput,
-	Level:  hclog.Debug,
-	Color:  hclog.AutoColor,
+	Name:        "fungo",
+	Output:      hclog.DefaultOutput,
+	DisableTime: false,
+	Level:       hclog.Debug,
+	Color:       hclog.AutoColor,
 })
 
 // PluginTypeEnvName is used to specify hashicorp go plugin type, rpc/grpc

fungo/plugin.go

@@ -57,9 +57,8 @@ func Register(funcName string, fn interface{}) {
 func serveRPC() {
 	rpcPluginName := "rpc"
 	logger.Info("start plugin server in RPC mode")
-	logger = logger.Named(rpcPluginName)
 	funcPlugin := &functionPlugin{
-		logger:    logger,
+		logger:    logger.Named("func_exec"),
 		functions: functions,
 	}
 	var pluginMap = map[string]plugin.Plugin{
@@ -76,9 +75,8 @@ func serveRPC() {
 func serveGRPC() {
 	grpcPluginName := "grpc"
 	logger.Info("start plugin server in gRPC mode")
-	logger = logger.Named(grpcPluginName)
 	funcPlugin := &functionPlugin{
-		logger:    logger,
+		logger:    logger.Named("func_exec"),
 		functions: functions,
 	}
 	var pluginMap = map[string]plugin.Plugin{

go_plugin.go

@@ -22,6 +22,9 @@ func newGoPlugin(path string) (*goPlugin, error) {
 		return nil, fmt.Errorf("go plugin does not support windows")
 	}
 
+	// logger
+	logger = logger.ResetNamed("go-plugin")
+
 	plg, err := plugin.Open(path)
 	if err != nil {
 		logger.Error("load go plugin failed", "path", path, "error", err)

go_plugin_test.go

@@ -33,7 +33,7 @@ func TestCallPluginFunction(t *testing.T) {
 	buildGoPlugin()
 	defer removeGoPlugin()
 
-	plugin, err := Init("debugtalk.so")
+	plugin, err := Init("debugtalk.so", WithDebugLogger(true))
 	if err != nil {
 		t.Fatal(err)
 	}

hashicorp_plugin.go

@@ -6,7 +6,6 @@ import (
 	"os/exec"
 	"sync"
 
-	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
 	"github.com/pkg/errors"
 
@@ -47,14 +46,7 @@ func newHashicorpPlugin(path string, option *pluginOption) (*hashicorpPlugin, er
 	}
 
 	// logger
-	logger = logger.Named(fmt.Sprintf("%v-%v", p.rpcType, p.option.langType))
-	if p.option.debugLogger {
-		logger.Info("set plugin log level to DEBUG")
-		logger.SetLevel(hclog.Debug)
-	} else {
-		logger.Info("set plugin log level to INFO")
-		logger.SetLevel(hclog.Info)
-	}
+	logger = logger.ResetNamed(fmt.Sprintf("hc-%v-%v", p.rpcType, p.option.langType))
 
 	// cmd
 	var cmd *exec.Cmd

hashicorp_plugin_test.go

@@ -8,6 +8,7 @@ import (
 	"runtime"
 	"testing"
 
+	"github.com/httprunner/funplugin/fungo"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -28,7 +29,7 @@ func removeHashicorpGoPlugin() {
 	os.Remove(pluginBinPath)
 }
 
-func TestHashicorpGoPlugin(t *testing.T) {
+func TestHashicorpGRPCGoPlugin(t *testing.T) {
 	buildHashicorpGoPlugin()
 	defer removeHashicorpGoPlugin()
 
@@ -42,6 +43,21 @@ func TestHashicorpGoPlugin(t *testing.T) {
 	assertPlugin(t, plugin)
 }
 
+func TestHashicorpRPCGoPlugin(t *testing.T) {
+	buildHashicorpGoPlugin()
+	defer removeHashicorpGoPlugin()
+
+	os.Setenv(fungo.PluginTypeEnvName, "rpc")
+	plugin, err := Init("fungo/examples/debugtalk.bin",
+		WithDebugLogger(true))
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer plugin.Quit()
+
+	assertPlugin(t, plugin)
+}
+
 func TestHashicorpPythonPluginWithoutVenv(t *testing.T) {
 	_, err := Init("funppy/examples/debugtalk.py")
 	assert.EqualError(t, err, "python3 not specified")

init.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/hashicorp/go-hclog"
 	"github.com/httprunner/funplugin/fungo"
 )
 
@@ -54,7 +55,16 @@ func Init(path string, options ...Option) (plugin IPlugin, err error) {
 	for _, o := range options {
 		o(option)
 	}
+
+	// logger
 	logger.Info("init plugin", "path", path)
+	if option.debugLogger {
+		logger.Info("set plugin log level to DEBUG")
+		logger.SetLevel(hclog.Debug)
+	} else {
+		logger.Info("set plugin log level to INFO")
+		logger.SetLevel(hclog.Info)
+	}
 
 	// priority: hashicorp plugin > go plugin
 	ext := filepath.Ext(path)