Mercurial > hg > orthanc
comparison OrthancServer/LuaScripting.cpp @ 2738:3a55b77339ff
fix deadlock in Lua scripts
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 16 Jul 2018 11:19:30 +0200 |
parents | 815e30657dad |
children | 6e3a60b85da6 |
comparison
equal
deleted
inserted
replaced
2737:8ed9893c9230 | 2738:3a55b77339ff |
---|---|
580 lua_.RegisterFunction("RestApiGet", RestApiGet); | 580 lua_.RegisterFunction("RestApiGet", RestApiGet); |
581 lua_.RegisterFunction("RestApiPost", RestApiPost); | 581 lua_.RegisterFunction("RestApiPost", RestApiPost); |
582 lua_.RegisterFunction("RestApiPut", RestApiPut); | 582 lua_.RegisterFunction("RestApiPut", RestApiPut); |
583 lua_.RegisterFunction("RestApiDelete", RestApiDelete); | 583 lua_.RegisterFunction("RestApiDelete", RestApiDelete); |
584 lua_.RegisterFunction("GetOrthancConfiguration", GetOrthancConfiguration); | 584 lua_.RegisterFunction("GetOrthancConfiguration", GetOrthancConfiguration); |
585 | |
586 LOG(INFO) << "Initializing Lua for the event handler"; | |
587 LoadGlobalConfiguration(); | |
585 } | 588 } |
586 | 589 |
587 | 590 |
588 LuaScripting::~LuaScripting() | 591 LuaScripting::~LuaScripting() |
589 { | 592 { |