kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbx_lua: On configuration errors report module load failure instead of decline.

Browse Source 
Switched from AST_MODULE_LOAD_DECLINE to AST_MODULE_LOAD_FAILURE.
Therefore, if pbx_lua fails to load and pbx_lua is marked as required,
Asterisk exits as expected.
If extensions.lua cannot be opened, AST_MODULE_LOAD_DECLINE is reported.

Change-Id: I8e5a0037e69b41743db60c568541ebb2f52a7a8f
This commit is contained in:
Dennis Guse
2016-11-23 21:52:29 +01:00
parent d9b24cce0a
commit ead773f801
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pbx/pbx_lua.c
View File

@@ -60,7 +60,7 @@ static char *registrar = "pbx_lua";
* applications might return */ * applications might return */
#define LUA_GOTO_DETECTED 5 #define LUA_GOTO_DETECTED 5
static char *lua_read_extensions_file(lua_State *L, long *size); static char *lua_read_extensions_file(lua_State *L, long *size, int *file_not_openable);
static int lua_load_extensions(lua_State *L, struct ast_channel *chan); static int lua_load_extensions(lua_State *L, struct ast_channel *chan);
static int lua_reload_extensions(lua_State *L); static int lua_reload_extensions(lua_State *L);
static void lua_free_extensions(void); static void lua_free_extensions(void);
@@ -1070,12 +1070,13 @@ static int lua_extension_cmp(lua_State *L)
* *
* \param L the lua_State to use * \param L the lua_State to use
* \param size a pointer to store the size of the buffer * \param size a pointer to store the size of the buffer
* \param file_not_openable a pointer to store if config file could be opened
* *
* \note The caller is expected to free the buffer at some point. * \note The caller is expected to free the buffer at some point.
* *
* \return a pointer to the buffer * \return a pointer to the buffer
*/ */
static char *lua_read_extensions_file(lua_State *L, long *size) static char *lua_read_extensions_file(lua_State *L, long *size, int *file_not_openable)
{ {
FILE *f; FILE *f;
int error_func; int error_func;
@@ -1090,6 +1091,8 @@ static char *lua_read_extensions_file(lua_State *L, long *size)
lua_pushstring(L, strerror(errno)); lua_pushstring(L, strerror(errno));
lua_concat(L, 4); lua_concat(L, 4);
*file_not_openable = 1;
return NULL; return NULL;
} }
@@ -1199,10 +1202,14 @@ static int lua_reload_extensions(lua_State *L)
{ {
long size = 0; long size = 0;
char *data = NULL; char *data = NULL;
int file_not_openable = 0;
luaL_openlibs(L); luaL_openlibs(L);
if (!(data = lua_read_extensions_file(L, &size))) { if (!(data = lua_read_extensions_file(L, &size, &file_not_openable))) {
if (file_not_openable) {
return -1;
}
return 1; return 1;
} }
@@ -1621,17 +1628,24 @@ static struct ast_switch lua_switch = {
static int load_or_reload_lua_stuff(void) static int load_or_reload_lua_stuff(void)
{ {
int res = AST_MODULE_LOAD_SUCCESS; int res = AST_MODULE_LOAD_SUCCESS;
int loaded = 0;
lua_State *L = luaL_newstate(); lua_State *L = luaL_newstate();
if (!L) { if (!L) {
ast_log(LOG_ERROR, "Error allocating lua_State, no memory\n"); ast_log(LOG_ERROR, "Error allocating lua_State, no memory\n");
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_FAILURE;
} }
if (lua_reload_extensions(L)) { loaded = lua_reload_extensions(L);
if (loaded) {
const char *error = lua_tostring(L, -1); const char *error = lua_tostring(L, -1);
ast_log(LOG_ERROR, "Error loading extensions.lua: %s\n", error); ast_log(LOG_ERROR, "Error loading extensions.lua: %s\n", error);
res = AST_MODULE_LOAD_DECLINE;
if (loaded < 0) {
res = AST_MODULE_LOAD_DECLINE;
} else {
res = AST_MODULE_LOAD_FAILURE;
}
} }
if (!res) { if (!res) {
@@ -1664,7 +1678,7 @@ static int load_module(void)
if (ast_register_switch(&lua_switch)) { if (ast_register_switch(&lua_switch)) {
ast_log(LOG_ERROR, "Unable to register LUA PBX switch\n"); ast_log(LOG_ERROR, "Unable to register LUA PBX switch\n");
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_FAILURE;
} }
return AST_MODULE_LOAD_SUCCESS; return AST_MODULE_LOAD_SUCCESS;