fixed: as we have insert_page ezc function now

we cannot delete ezc patterns when PatternCacher::GetPattern() method is called
       because we can delete a pattern which is in use
       now deleting is performed at the end of a request


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@751 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2011-07-15 02:09:02 +00:00
parent 1812a2e9ad
commit c37c1ff812
9 changed files with 108 additions and 54 deletions

View File

@@ -143,11 +143,7 @@ bool App::Init()
compress.Init();
system.Init();
functions.Init();
// init templates after functions are created
templates.CreateFunctions(); // create functions first (functions will be cached by patterns)
templates.ReadIndexFileNames();
templates.ReadTemplates();
templates.Init(); // init templates after functions are created
// init notify after templates (it uses locales from templates)
system.notify.ReadTemplates();
@@ -237,7 +233,6 @@ void App::ProcessRequest()
SaveSessionsIfNeeded(); // !! przerzucic to na watek sesji
system.load_avg.StopRequest();
log << logendrequest;
}
catch(const std::exception & e)
{
@@ -259,12 +254,14 @@ void App::ProcessRequest()
}
catch(...)
{
log << log1 << "App: an exception when clearing the request (from a plugin)" << logend;
log << log1 << "App: an exception when clearing after a request (exception from a plugin)" << logend;
}
// simple operations which should not throw an exception
templates.RequestEnd();
cur.request->Clear();
cur.session = session_manager.GetTmpSession();
log << logendrequest;
}