Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Return error message when lua error occurs.

Browse Source 
The error may not be the first item in the stack while we're inside the error handler.  ::from_stack() works OK outside the error callback, but not inside.
This commit is contained in:
Daniel Patterson 2015-05-21 15:39:23 -07:00
parent 8b8188710e
commit eab87c0827
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extractor/restriction_parser.cpp
View File

@ -44,7 +44,7 @@ namespace
{ {
int lua_error_callback(lua_State *lua_state) int lua_error_callback(lua_State *lua_state)
{ {
luabind::object error_msg(luabind::from_stack(lua_state, -1)); std::string error_msg = lua_tostring(lua_state, -1);
std::ostringstream error_stream; std::ostringstream error_stream;
error_stream << error_msg; error_stream << error_msg;
throw osrm::exception("ERROR occured in profile script:\n" + error_stream.str()); throw osrm::exception("ERROR occured in profile script:\n" + error_stream.str());

2
extractor/scripting_environment.cpp
View File

@ -53,7 +53,7 @@ auto get_value_by_key(T const &object, const char *key) -> decltype(object.get_v
int lua_error_callback(lua_State *L) // This is so I can use my own function as an int lua_error_callback(lua_State *L) // This is so I can use my own function as an
// exception handler, pcall_log() // exception handler, pcall_log()
{ {
luabind::object error_msg(luabind::from_stack(L, -1)); std::string error_msg = lua_tostring(L, -1);
std::ostringstream error_stream; std::ostringstream error_stream;
error_stream << error_msg; error_stream << error_msg;
throw osrm::exception("ERROR occured in profile script:\n" + error_stream.str()); throw osrm::exception("ERROR occured in profile script:\n" + error_stream.str());