go-packages/iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-03-14 08:16:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix plugin activation when this activates other (sub)plugins

Browse Source
This commit is contained in:
Gerasimos Maropoulos 2016-10-16 20:14:47 +03:00
parent 7e8c1e57d2
commit 5ee987feb9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugin.go
View File

@ -255,13 +255,13 @@ type pluginContainer struct {
customEvents map[string][]func() customEvents map[string][]func()
downloader *pluginDownloadManager downloader *pluginDownloadManager
logger *log.Logger logger *log.Logger
mu sync.Mutex mu *sync.Mutex
fired map[string]int // event/plugin type name and the times fired fired map[string]int // event/plugin type name and the times fired
} }
// newPluginContainer receives a logger and returns a new PluginContainer // newPluginContainer receives a logger and returns a new PluginContainer
func newPluginContainer(l *log.Logger) PluginContainer { func newPluginContainer(l *log.Logger) PluginContainer {
return &pluginContainer{logger: l, fired: make(map[string]int, 0)} return &pluginContainer{logger: l, fired: make(map[string]int, 0), mu: &sync.Mutex{}}
} }
// Add activates the plugins and if succeed then adds it to the activated plugins list // Add activates the plugins and if succeed then adds it to the activated plugins list
@ -282,16 +282,16 @@ func (p *pluginContainer) Add(plugins ...Plugin) error {
// Activate the plugin, if no error then add it to the plugins // Activate the plugin, if no error then add it to the plugins
if pluginObj, ok := plugin.(pluginActivate); ok { if pluginObj, ok := plugin.(pluginActivate); ok {
//tempPluginContainer := *p // contains the mutex but we' re safe here. tempPluginContainer := *p
err := pluginObj.Activate(p) err := pluginObj.Activate(&tempPluginContainer)
if err != nil { if err != nil {
return errPluginActivate.Format(pName, err.Error()) return errPluginActivate.Format(pName, err.Error())
} }
/*
tempActivatedPluginsLen := len(tempPluginContainer.activatedPlugins) tempActivatedPluginsLen := len(tempPluginContainer.activatedPlugins)
if tempActivatedPluginsLen != len(p.activatedPlugins)+tempActivatedPluginsLen+1 { // see test: plugin_test.go TestPluginActivate && TestPluginActivationError if tempActivatedPluginsLen != len(p.activatedPlugins)+tempActivatedPluginsLen+1 { // see test: plugin_test.go TestPluginActivate && TestPluginActivationError
p.activatedPlugins = tempPluginContainer.activatedPlugins p.activatedPlugins = tempPluginContainer.activatedPlugins
}*/ }
} }