GetScriptDir -> GetScriptsDir

[stg.git] / projects / stargazer / main.cpp

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 2d5b808f6a5ef21e38f0eb0eebcea74110eb1e7b..6a8c61f51dea08829f1a4fd38a45ccdd585e575b 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -46,11 +46,12 @@
 
 #include "settings.h"
 #include "user.h"
 
 #include "settings.h"
 #include "user.h"

-#include "users.h"
-#include "admins.h"
+#include "users_impl.h"
+#include "admins_impl.h"
+#include "tariffs_impl.h"

 #include "common.h"
 #include "traffcounter.h"
 #include "common.h"
 #include "traffcounter.h"

-#include "base_plugin.h"
+#include "plugin.h"

 #include "stg_logger.h"
 #include "stg_timer.h"
 #include "plugin_runner.h"
 #include "stg_logger.h"
 #include "stg_timer.h"
 #include "plugin_runner.h"


@@ -450,7 +451,7 @@ int main(int argc, char * argv[])
  * */
 
 SETTINGS * settings = NULL;
  * */
 
 SETTINGS * settings = NULL;

-BASE_STORE * dataStore = NULL;
+STORE * dataStore = NULL;

 TARIFFS * tariffs = NULL;
 ADMINS * admins = NULL;
 USERS * users = NULL;
 TARIFFS * tariffs = NULL;
 ADMINS * admins = NULL;
 USERS * users = NULL;


@@ -549,9 +550,9 @@ if (loop.Start())
 dataStore = storeLoader.GetStore();
 WriteServLog("Storage plugin: %s. Loading successfull.", dataStore->GetVersion().c_str());
 
 dataStore = storeLoader.GetStore();
 WriteServLog("Storage plugin: %s. Loading successfull.", dataStore->GetVersion().c_str());
 

-tariffs = new TARIFFS(dataStore);
-admins = new ADMINS(dataStore);
-users = new USERS(settings, dataStore, tariffs, admins->GetSysAdmin());
+tariffs = new TARIFFS_IMPL(dataStore);
+admins = new ADMINS_IMPL(dataStore);
+users = new USERS_IMPL(settings, dataStore, tariffs, admins->GetSysAdmin());

 traffCnt = new TRAFFCOUNTER(users, tariffs, settings->GetRulesFileName());
 traffCnt->SetMonitorDir(settings->GetMonitorDir());
 
 traffCnt = new TRAFFCOUNTER(users, tariffs, settings->GetRulesFileName());
 traffCnt->SetMonitorDir(settings->GetMonitorDir());
 


@@ -759,5 +760,3 @@ delete settings;
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-
-