GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-25 18:30:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #1549: avoid duplicate creating plugins

Browse Source
This commit is contained in:
lilong.129
2023-04-18 21:43:30 +08:00
parent ebeae0c777
commit 1ffee4734e
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hrp/pkg/convert/from_curl_test.go
View File

@@ -24,7 +24,7 @@ func TestLoadCurlCase(t *testing.T) {
if !assert.EqualValues(t, "GET", tCase.TestSteps[0].Request.Method) {
t.Fatal()
}
if !assert.Equal(t, "https://httpbin.org", tCase.TestSteps[0].Request.URL) {
if !assert.Equal(t, "http://httpbin.org", tCase.TestSteps[0].Request.URL) {
t.Fatal()
}

28
hrp/plugin.go
View File

@@ -31,31 +31,10 @@ const projectInfoFile = "proj.json" // used for ensuring root project
var (
pluginMap sync.Map // used for reusing plugin instance
pluginMutex sync.Mutex
pluginMutex sync.RWMutex
)
func initPlugin(path, venv string, logOn bool) (funplugin.IPlugin, error) {
if plugin, ok := pluginMap.Load(path); ok {
return plugin.(funplugin.IPlugin), nil
}
pluginMutex.Lock()
defer pluginMutex.Unlock()
if plugin, ok := pluginMap.Load(path); ok {
return plugin.(funplugin.IPlugin), nil
}
p, err := initplugin(path, venv, logOn)
if err != nil {
return nil, errors.Wrap(err, "init plugin failed")
}
pluginMap.Store(path, p)
return p, nil
}
func initplugin(path, venv string, logOn bool) (plugin funplugin.IPlugin, err error) {
func initPlugin(path, venv string, logOn bool) (plugin funplugin.IPlugin, err error) {
// plugin file not found
if path == "" {
return nil, nil
@@ -66,6 +45,9 @@ func initplugin(path, venv string, logOn bool) (plugin funplugin.IPlugin, err er
return nil, nil
}
pluginMutex.Lock()
defer pluginMutex.Unlock()
// reuse plugin instance if it already initialized
if p, ok := pluginMap.Load(pluginPath); ok {
return p.(funplugin.IPlugin), nil