A bit better Makefile

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

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index eace1afb41e433d4caa6c99a73a272830cf32260..e1bb4baefb2c40955661ede5717167adc28ff7dc 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -41,13 +41,13 @@
 #include "user_impl.h"
 #include "users.h"
 #include "common.h"
 #include "user_impl.h"
 #include "users.h"
 #include "common.h"

-#include "settings.h"
+#include "settings_impl.h"

 #include "script_executer.h"
 #include "tariff.h"
 #include "tariffs.h"
 #include "admin.h"
 
 #include "script_executer.h"
 #include "tariff.h"
 #include "tariffs.h"
 #include "admin.h"
 

-USER_IMPL::USER_IMPL(const SETTINGS * s,
+USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,

            const STORE * st,
            const TARIFFS * t,
            const ADMIN * a,
            const STORE * st,
            const TARIFFS * t,
            const ADMIN * a,


@@ -116,7 +116,7 @@ tariff = tariffs->GetNoTariff();
 ips = StrToIPS("*");
 deleted = false;
 lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();
 ips = StrToIPS("*");
 deleted = false;
 lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();

-lastWriteDeatiledStat = stgTime;
+lastWriteDetailedStat = stgTime;

 
 property.tariffName.AddBeforeNotifier(&tariffNotifier);
 property.passive.AddBeforeNotifier(&passiveNotifier);
 
 property.tariffName.AddBeforeNotifier(&tariffNotifier);
 property.passive.AddBeforeNotifier(&passiveNotifier);


@@ -194,7 +194,7 @@ connected = 0;
 deleted = u.deleted;
 
 lastWriteStat = u.lastWriteStat;
 deleted = u.deleted;
 
 lastWriteStat = u.lastWriteStat;

-lastWriteDeatiledStat = u.lastWriteDeatiledStat;
+lastWriteDetailedStat = u.lastWriteDetailedStat;

 
 settings = u.settings;
 
 
 settings = u.settings;
 


@@ -981,7 +981,7 @@ printfd(__FILE__, "USER::WriteDetailedStat() - size = %d\n", ts.size());
 
 if (ts.size() && !disabledDetailStat)
     {
 
 if (ts.size() && !disabledDetailStat)
     {

-    if (store->WriteDetailedStat(ts, lastWriteDeatiledStat, login))
+    if (store->WriteDetailedStat(ts, lastWriteDetailedStat, login))

         {
         printfd(__FILE__, "USER::WriteDetailStat() - failed to write current detail stat\n");
         WriteServLog("Cannot write detail stat for user %s.", login.c_str());
         {
         printfd(__FILE__, "USER::WriteDetailStat() - failed to write current detail stat\n");
         WriteServLog("Cannot write detail stat for user %s.", login.c_str());


@@ -991,12 +991,12 @@ if (ts.size() && !disabledDetailStat)
             printfd(__FILE__, "USER::WriteDetailStat() - pushing detail stat to queue\n");
             STG_LOCKER lock(&mutex, __FILE__, __LINE__);
             traffStatSaved.second.swap(ts);
             printfd(__FILE__, "USER::WriteDetailStat() - pushing detail stat to queue\n");
             STG_LOCKER lock(&mutex, __FILE__, __LINE__);
             traffStatSaved.second.swap(ts);

-            traffStatSaved.first = lastWriteDeatiledStat;
+            traffStatSaved.first = lastWriteDetailedStat;

             }
         return -1;
         }
     }
             }
         return -1;
         }
     }

-lastWriteDeatiledStat = stgTime;
+lastWriteDetailedStat = stgTime;

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------