diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-08-19 22:25:36 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-08-19 22:25:36 (GMT) |
commit | b9204bad8cc2957bc0ae6201640d2972e9d4c239 (patch) | |
tree | 6c7668606fb9b7016a01ce93993a654e95a63ef2 /src/uscxml | |
parent | 8b9ae4ba7aa509f467b97ae298642fbe1710ea36 (diff) | |
download | uscxml-b9204bad8cc2957bc0ae6201640d2972e9d4c239.zip uscxml-b9204bad8cc2957bc0ae6201640d2972e9d4c239.tar.gz uscxml-b9204bad8cc2957bc0ae6201640d2972e9d4c239.tar.bz2 |
Find JavaScriptCoreGTK3 as well
Diffstat (limited to 'src/uscxml')
-rw-r--r-- | src/uscxml/Interpreter.h | 6 | ||||
-rw-r--r-- | src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp | 7 | ||||
-rw-r--r-- | src/uscxml/server/HTTPServer.cpp | 1 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/uscxml/Interpreter.h b/src/uscxml/Interpreter.h index 66379f9..70fb888 100644 --- a/src/uscxml/Interpreter.h +++ b/src/uscxml/Interpreter.h @@ -114,9 +114,9 @@ public: withHTTPS(true), withWS(true), logLevel(0), - httpPort(0), - httpsPort(0), - wsPort(0) { + httpPort(5080), + httpsPort(5443), + wsPort(5081) { } bool withDebugger; diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp index ca50b75..dd3a0b4 100644 --- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp +++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp @@ -49,6 +49,7 @@ static int luaInspect(lua_State * l) { } bool _luaHasXMLParser = false; + static luabridge::LuaRef getDataAsLua(lua_State* _luaState, const Data& data) { luabridge::LuaRef luaData (_luaState); @@ -63,7 +64,7 @@ static luabridge::LuaRef getDataAsLua(lua_State* _luaState, const Data& data) { try { luaData = luaLomParse(luaXMLSS.str()); } catch (luabridge::LuaException e) { - LOG(ERROR) << e.what(); + ERROR_EXECUTION_THROW(e.what()); } return luaData; } @@ -152,7 +153,7 @@ boost::shared_ptr<DataModelImpl> LuaDataModel::create(InterpreterImpl* interpret luabridge::setGlobal(dm->_luaState, resultLxpLOM, "lxp.lom"); } } catch (luabridge::LuaException e) { - LOG(ERROR) << e.what(); + LOG(INFO) << e.what(); } luabridge::getGlobalNamespace(dm->_luaState).beginClass<InterpreterImpl>("Interpreter").endClass(); @@ -258,7 +259,7 @@ void LuaDataModel::setEvent(const Event& event) { try { luaEvent["data"] = luaLomParse(luaXMLSS.str()); } catch (luabridge::LuaException e) { - LOG(ERROR) << e.what(); + ERROR_EXECUTION_THROW(e.what()); } } else { ERROR_EXECUTION_THROW("No DOM support in Lua datamodel"); diff --git a/src/uscxml/server/HTTPServer.cpp b/src/uscxml/server/HTTPServer.cpp index 48d2f96..1b92203 100644 --- a/src/uscxml/server/HTTPServer.cpp +++ b/src/uscxml/server/HTTPServer.cpp @@ -566,7 +566,6 @@ bool HTTPServer::registerServlet(const std::string& path, HTTPServlet* servlet) HTTPServer* INSTANCE = getInstance(); if (!INSTANCE->_httpHandle) { - LOG(ERROR) << "Registering a servlet at '" << path << "' with no HTTPServer running, did you forget to specify a port?"; return true; // this is the culprit! } |