start working on 0.7.x branch
- added FileLog which stores content to the file log - now Log is only a wrapper - it puts messages to the local buffer and when logsave is used then the buffer is put to FileLog - new base classes: WinixBase (Log, Config*, Synchro*) WinixModel : public WinixBase (morm::ModelConnector*, Plugin*) WinixSystem : public WinixModel (System*) WinixRequest : public WinixSystem (SLog, Cur*) - singletons: log, slog, plugin are depracated - now references to them are in base classses (WinixBase, WinixModel) - DbBase, DbConn and Db are depracated - now we are using Morm project (in WinixModel there is a model_connector pointer) each thread will have its own ModelConnector git-svn-id: svn://ttmath.org/publicrep/winix/branches/0.7.x@1146 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -80,7 +80,7 @@ void ReloadConfigFile(PluginInfo & info, Item & file)
|
||||
|
||||
if( status == PT::SpaceParser::syntax_error )
|
||||
{
|
||||
log << log1 << "MR: syntax error in file: " << file.url << ", line: " << parser.line << " (skipping this file)" << logend;
|
||||
info.log << log1 << "MR: syntax error in file: " << file.url << ", line: " << parser.line << " (skipping this file)" << logend;
|
||||
}
|
||||
else
|
||||
if( status == PT::SpaceParser::ok )
|
||||
@@ -91,11 +91,11 @@ void ReloadConfigFile(PluginInfo & info, Item & file)
|
||||
{
|
||||
int list_id = Toi(*list_id_str);
|
||||
rm_info.lists.insert( std::make_pair(list_id, file.url) );
|
||||
log << log3 << "RM: file: " << file.url << " parsed successfully" << logend;
|
||||
info.log << log3 << "RM: file: " << file.url << " parsed successfully" << logend;
|
||||
}
|
||||
else
|
||||
{
|
||||
log << log1 << "MR: file: " << file.url << " doesn't have a list_id defined (skipping this file)" << logend;
|
||||
info.log << log1 << "MR: file: " << file.url << " doesn't have a list_id defined (skipping this file)" << logend;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -109,7 +109,7 @@ void ConfigReload(PluginInfo & info)
|
||||
|
||||
if( dir_str.empty() )
|
||||
{
|
||||
log << log1 << "RM: rm_directory config option is empty" << logend;
|
||||
info.log << log1 << "RM: rm_directory config option is empty" << logend;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -170,11 +170,11 @@ using namespace MailRegister;
|
||||
fun_rm_showusers.SetMDb(&mdb);
|
||||
fun_rm_showusers.SetInfo(&rm_info);
|
||||
|
||||
plugin.Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
|
||||
plugin.Assign(WINIX_CREATE_FUNCTIONS, AddWinixFunctions);
|
||||
info.plugin->Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
|
||||
info.plugin->Assign(WINIX_CREATE_FUNCTIONS, AddWinixFunctions);
|
||||
|
||||
plugin.Assign(WINIX_PLUGIN_INIT, InitPlugin);
|
||||
plugin.Assign(WINIX_PROCESS_REQUEST, ProcessRequest);
|
||||
info.plugin->Assign(WINIX_PLUGIN_INIT, InitPlugin);
|
||||
info.plugin->Assign(WINIX_PROCESS_REQUEST, ProcessRequest);
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user