kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #857 from lazedo/patch-6 

[mod_expr] log errors
This commit is contained in:
Andrey Volk 2020-09-16 18:13:28 +04:00 committed by GitHub
parent 5db313de81 da4fa9bac7
commit 344120d71f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/mod/applications/mod_expr/mod_expr.c
View File

@ -83,13 +83,17 @@ SWITCH_STANDARD_API(expr_function)
/* Create function list */ /* Create function list */
err = exprFuncListCreate(&f); err = exprFuncListCreate(&f);
if (err != EXPR_ERROR_NOERROR) if (err != EXPR_ERROR_NOERROR) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "CREATE FUNC LIST\n");
goto error; goto error;
}
/* Init function list with internal functions */ /* Init function list with internal functions */
err = exprFuncListInit(f); err = exprFuncListInit(f);
if (err != EXPR_ERROR_NOERROR) if (err != EXPR_ERROR_NOERROR) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INIT FUNC LIST\n");
goto error; goto error;
}
/* Add custom function */ /* Add custom function */
//err = exprFuncListAdd(f, my_func, "myfunc", 1, 1, 1, 1); //err = exprFuncListAdd(f, my_func, "myfunc", 1, 1, 1, 1);
@ -98,29 +102,39 @@ SWITCH_STANDARD_API(expr_function)
/* Create constant list */ /* Create constant list */
err = exprValListCreate(&c); err = exprValListCreate(&c);
if (err != EXPR_ERROR_NOERROR) if (err != EXPR_ERROR_NOERROR) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "CREATE CONST LIST\n");
goto error; goto error;
}
/* Init constant list with internal constants */ /* Init constant list with internal constants */
err = exprValListInit(c); err = exprValListInit(c);
if (err != EXPR_ERROR_NOERROR) if (err != EXPR_ERROR_NOERROR) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "CREATE INTERNAL CONST LIST\n");
goto error; goto error;
}
/* Create variable list */ /* Create variable list */
err = exprValListCreate(&v); err = exprValListCreate(&v);
if (err != EXPR_ERROR_NOERROR) if (err != EXPR_ERROR_NOERROR) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "CREATE VARIABLE LIST\n");
goto error; goto error;
}
/* Create expression object */ /* Create expression object */
err = exprCreate(&e, f, v, c, breaker, NULL); err = exprCreate(&e, f, v, c, breaker, NULL);
if (err != EXPR_ERROR_NOERROR) if (err != EXPR_ERROR_NOERROR) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "EXPR OBJECT\n");
goto error; goto error;
}
/* Parse expression */ /* Parse expression */
err = exprParse(e, (char *) expr); err = exprParse(e, (char *) expr);
if (err != EXPR_ERROR_NOERROR) if (err != EXPR_ERROR_NOERROR) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "PARSE EXPR => %s\n", cmd);
goto error; goto error;
}
/* Enable soft errors */ /* Enable soft errors */
//exprSetSoftErrors(e, 1); //exprSetSoftErrors(e, 1);
@ -135,6 +149,7 @@ SWITCH_STANDARD_API(expr_function)
} while (err && ec < 3); } while (err && ec < 3);
if (err) { if (err) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "EXPR VAL\n");
goto error; goto error;
} }