From: Jason at zx2c4.com (Jason A. Donenfeld)
Subject: [PATCH 08/12] filter: lua error reporting
Date: Mon, 13 Jan 2014 05:11:15 +0100 [thread overview]
Message-ID: <1389586279-23724-9-git-send-email-Jason@zx2c4.com> (raw)
In-Reply-To: <1389586279-23724-1-git-send-email-Jason@zx2c4.com>
Signed-off-by: Jason A. Donenfeld <Jason at zx2c4.com>
---
filter.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/filter.c b/filter.c
index 6f0e298..d2f6a4f 100644
--- a/filter.c
+++ b/filter.c
@@ -182,6 +182,12 @@ struct lua_filter {
lua_State *lua_state;
};
+static void error_lua_filter(struct lua_filter *filter)
+{
+ die("Lua error in %s: %s", filter->script_file, lua_tostring(filter->lua_state, -1));
+ lua_pop(filter->lua_state, 1);
+}
+
static ssize_t write_lua_filter(struct cgit_filter *base, const void *buf, size_t count)
{
struct lua_filter *filter = (struct lua_filter *) base;
@@ -189,6 +195,7 @@ static ssize_t write_lua_filter(struct cgit_filter *base, const void *buf, size_
lua_getglobal(filter->lua_state, "filter_write");
lua_pushlstring(filter->lua_state, buf, count);
if (lua_pcall(filter->lua_state, 1, 0, 0)) {
+ error_lua_filter(filter);
errno = EPROTO;
return -1;
}
@@ -237,6 +244,7 @@ static int init_lua_filter(struct lua_filter *filter)
lua_setglobal(filter->lua_state, "html");
if (luaL_dofile(filter->lua_state, filter->script_file)) {
+ error_lua_filter(filter);
lua_close(filter->lua_state);
filter->lua_state = NULL;
return 1;
@@ -257,8 +265,10 @@ static int open_lua_filter(struct cgit_filter *base, va_list ap)
lua_getglobal(filter->lua_state, "filter_open");
for (i = 0; i < filter->base.argument_count; ++i)
lua_pushstring(filter->lua_state, va_arg(ap, char *));
- if (lua_pcall(filter->lua_state, filter->base.argument_count, 0, 0))
+ if (lua_pcall(filter->lua_state, filter->base.argument_count, 0, 0)) {
+ error_lua_filter(filter);
return 1;
+ }
return 0;
}
@@ -268,8 +278,10 @@ static int close_lua_filter(struct cgit_filter *base)
int ret = 0;
lua_getglobal(filter->lua_state, "filter_close");
- if (lua_pcall(filter->lua_state, 0, 0, 0))
+ if (lua_pcall(filter->lua_state, 0, 0, 0)) {
+ error_lua_filter(filter);
ret = 1;
+ }
unhook_write();
return ret;
}
--
1.8.5.2
next prev parent reply other threads:[~2014-01-13 4:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-13 4:11 [PATCH 00/12] filter framework and lua integration: complete Jason
2014-01-13 4:11 ` [PATCH 01/12] filter: add fprintf_filter function Jason
2014-01-13 4:11 ` [PATCH 02/12] filter: add interface layer Jason
2014-01-13 4:11 ` [PATCH 03/12] filter: introduce "filter type" prefix Jason
2014-01-13 4:11 ` [PATCH 04/12] filter: allow for cleanup hook for filter types Jason
2014-01-13 4:11 ` [PATCH 05/12] filter: basic write hooking infrastructure Jason
2014-01-13 8:19 ` cgit
2014-01-13 4:11 ` [PATCH 06/12] filter: add preliminary lua support Jason
2014-01-13 8:31 ` cgit
2014-01-13 8:53 ` john
2014-01-13 8:39 ` cgit
2014-01-13 8:55 ` john
2014-01-13 9:41 ` bluewind
2014-01-13 4:11 ` [PATCH 07/12] filter: document lua filter type Jason
2014-01-13 4:11 ` Jason [this message]
2014-01-13 4:11 ` [PATCH 09/12] filter: return on null filter from open and close Jason
2014-01-13 4:11 ` [PATCH 10/12] filter: add support for email filter Jason
2014-01-13 4:11 ` [PATCH 11/12] filter: add simple gravatar " Jason
2014-01-13 4:11 ` [PATCH 12/12] filter: add gravatar lua script Jason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389586279-23724-9-git-send-email-Jason@zx2c4.com \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).