aboutsummaryrefslogtreecommitdiff
path: root/server.go
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2020-01-20 22:04:50 +0100
committerSimon Ser <contact@emersion.fr>2020-01-20 22:04:50 +0100
commitb58c15d121095ef58f8fb1ac5d3a456e89baee2a (patch)
tree2cc12e88691d811b3379f437cc821ab214e1992d /server.go
parentefa08163333654f3245c272333e77565b6287b14 (diff)
downloadalps-b58c15d121095ef58f8fb1ac5d3a456e89baee2a.tar.gz
alps-b58c15d121095ef58f8fb1ac5d3a456e89baee2a.zip
Extract Lua infrastructure into a plugin
Diffstat (limited to 'server.go')
-rw-r--r--server.go18
1 files changed, 5 insertions, 13 deletions
diff --git a/server.go b/server.go
index 83a636e..a8c2123 100644
--- a/server.go
+++ b/server.go
@@ -18,9 +18,8 @@ type Server struct {
e *echo.Echo
Sessions *SessionManager
- mutex sync.RWMutex // used for server reload
- plugins []Plugin
- luaPlugins []Plugin
+ mutex sync.RWMutex // used for server reload
+ plugins []Plugin
// maps protocols to URLs (protocol can be empty for auto-discovery)
upstreams map[string]*url.URL
@@ -188,12 +187,6 @@ func (s *Server) load() error {
plugins = append(plugins, l...)
}
- luaPlugins, err := loadAllLuaPlugins(s.e.Logger)
- if err != nil {
- return fmt.Errorf("failed to load plugins: %v", err)
- }
- plugins = append(plugins, luaPlugins...)
-
renderer := newRenderer(s.e.Logger, s.defaultTheme)
if err := renderer.Load(plugins); err != nil {
return fmt.Errorf("failed to load templates: %v", err)
@@ -204,15 +197,14 @@ func (s *Server) load() error {
s.mutex.Lock()
defer s.mutex.Unlock()
- // Close previous Lua plugins
- for _, p := range s.luaPlugins {
+ // Close previous plugins
+ for _, p := range s.plugins {
if err := p.Close(); err != nil {
- s.e.Logger.Printf("Failed to unload plugin '%v': %v", p.Name(), err)
+ s.e.Logger.Printf("Failed to unload plugin %q: %v", p.Name(), err)
}
}
s.plugins = plugins
- s.luaPlugins = luaPlugins
s.e.Renderer = renderer
for _, p := range plugins {