From: Steven Barth <steven@midlink.org>
Date: Fri, 5 Sep 2008 09:37:02 +0000 (+0000)
Subject: Optimized error handling
X-Git-Tag: 0.8.0~153
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cac36db0805f0238f374db15408c6820ab08eb60;p=oweals%2Fluci.git

Optimized error handling
---

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index e3dc6370e..7692dd226 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -464,18 +464,10 @@ function cbi(model)
 		require("luci.cbi")
 		require("luci.template")
 
-		local stat, maps = luci.util.copcall(luci.cbi.load, model, ...)
-		if not stat then
-			error500(maps)
-			return true
-		end
+		maps = luci.cbi.load(model, ...)
 
 		for i, res in ipairs(maps) do
-			local stat, err = luci.util.copcall(res.parse, res)
-			if not stat then
-				error500(err)
-				return true
-			end
+			res:parse()
 		end
 
 		luci.template.render("cbi/header")
@@ -493,18 +485,10 @@ function form(model)
 		require("luci.cbi")
 		require("luci.template")
 
-		local stat, maps = luci.util.copcall(luci.cbi.load, model, ...)
-		if not stat then
-			error500(maps)
-			return true
-		end
+		maps = luci.cbi.load(model, ...)
 
 		for i, res in ipairs(maps) do
-			local stat, err = luci.util.copcall(res.parse, res)
-			if not stat then
-				error500(err)
-				return true
-			end
+			res:parse()
 		end
 
 		luci.template.render("header")