summaryrefslogtreecommitdiffhomepage
path: root/modules.go
diff options
context:
space:
mode:
authorMatthew Holt <[email protected]>2019-04-08 00:00:14 -0600
committerMatthew Holt <[email protected]>2019-04-08 00:00:14 -0600
commit402f423693d86d3e37daf64f369dbf54f69338b3 (patch)
tree8b4716e35cb59f23d27bbe6ab17b11d03be9a1be /modules.go
parent3eae6d43b62db96c1d69e82c8d2997b6bf41beda (diff)
downloadcaddy-402f423693d86d3e37daf64f369dbf54f69338b3.tar.gz
caddy-402f423693d86d3e37daf64f369dbf54f69338b3.zip
Implement "global" state for modules, OnLoad and OnUnload callbacks
Tested for memory leaks and performance. Obviously the added locking and global state is not awesome, but the alternative is a little uglier IMO: we'd have to make some sort of "liaison" value which stores the state, then pass it around to every module, and so LoadModule becomes a lot less accessible, and each module would need to maintain a reference to it... nope, just ugly. I think this is the cleaner solution: just make sure only one Start() happens at a time, and keep global things global. Very simple log middleware is an example. Might need to reorder the operations in Start() and handle errors differently, etc. Otherwise, I'm mostly happy with this solution...
Diffstat (limited to 'modules.go')
-rw-r--r--modules.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/modules.go b/modules.go
index 46dfbe827..ac41f16ae 100644
--- a/modules.go
+++ b/modules.go
@@ -11,8 +11,10 @@ import (
// Module is a module.
type Module struct {
- Name string
- New func() (interface{}, error)
+ Name string
+ New func() (interface{}, error)
+ OnLoad func(instances []interface{}, priorState interface{}) (newState interface{}, err error)
+ OnUnload func(state interface{}) error
}
func (m Module) String() string { return m.Name }
@@ -145,6 +147,8 @@ func LoadModule(name string, rawMsg json.RawMessage) (interface{}, error) {
}
}
+ moduleInstances[mod.Name] = append(moduleInstances[mod.Name], val)
+
return val, nil
}