libs/web: Return more verbose error messages when template execution fails

diff --git a/libs/web/luasrc/template.lua b/libs/web/luasrc/template.lua
index 907403fcbba7d4ce79ff76475e3f5474017e571d..d49bceac7dd8f5ef43202ff86dc2fd0f8e8282ef 100644 (file)
--- a/libs/web/luasrc/template.lua
+++ b/libs/web/luasrc/template.lua
@@ -144,6 +144,7 @@ setmetatable(Template.cache, {__mode = "v"})
 -- Constructor - Reads and compiles the template on-demand
 function Template.__init__(self, name) 
        self.template = self.cache[name]
+       self.name = name
        
        -- Create a new namespace for this template
        self.viewns = {}
@@ -226,7 +227,10 @@ function Template.render(self, scope)
        luci.util.updfenv(self.template, self.viewns)
        
        -- Now finally render the thing
-       self.template()
+       local stat, err = luci.util.copcall(self.template)
+       if not stat then
+               error("Error in template %s: %s" % {self.name, err})
+       end
        
        -- Reset environment
        setfenv(self.template, oldfenv)