Mercurial > hg > orthanc

diff OrthancServer/main.cpp @ 1433:461e7554bff7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring: LuaScripting
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 30 Jun 2015 15:09:34 +0200
parents b22ba8c5edbe
children f9cd40166269
line wrap: on
line diff
--- a/OrthancServer/main.cpp	Tue Jun 30 12:51:29 2015 +0200
+++ b/OrthancServer/main.cpp	Tue Jun 30 15:09:34 2015 +0200
@@ -232,7 +232,7 @@
     {
       std::string lua = "Is" + configuration;
 
-      ServerContext::LuaContextLocker locker(context_);
+      LuaScripting::Locker locker(context_.GetLua());
       
       if (locker.GetLua().IsExistingFunction(lua.c_str()))
       {
@@ -265,7 +265,7 @@
   {
     static const char* HTTP_FILTER = "IncomingHttpRequestFilter";
 
-    ServerContext::LuaContextLocker locker(context_);
+    LuaScripting::Locker locker(context_.GetLua());
 
     // Test if the instance must be filtered out
     if (locker.GetLua().IsExistingFunction(HTTP_FILTER))
@@ -363,7 +363,7 @@
     std::string script;
     Toolbox::ReadFile(script, path);
 
-    ServerContext::LuaContextLocker locker(context);
+    LuaScripting::Locker locker(context.GetLua());
     locker.GetLua().Execute(script);
   }
 }