Fixed merge issues.

diff --git a/include/stg/user_traff.h b/include/stg/user_traff.h
index 4d5efe6251c42bf7be5239a7da552b585e616b78..1b9e2035ce9e8466457bf4c2857ff61cf1451367 100644 (file)
--- a/include/stg/user_traff.h
+++ b/include/stg/user_traff.h
@@ -27,12 +27,13 @@
 #ifndef USER_TRAFF_H
 #define USER_TRAFF_H
 
 #ifndef USER_TRAFF_H
 #define USER_TRAFF_H
 

-#include <iostream>
-#include <vector>
-
+#include "resetable.h"

 #include "const.h"
 #include "os_int.h"
 
 #include "const.h"
 #include "os_int.h"
 

+#include <iostream>
+#include <vector>
+

 enum TRAFF_DIRECTION {TRAFF_UPLOAD, TRAFF_DOWNLOAD};
 
 class DIR_TRAFF
 enum TRAFF_DIRECTION {TRAFF_UPLOAD, TRAFF_DOWNLOAD};
 
 class DIR_TRAFF

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store.cpp b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
index 8e3c9d90f0432bd70c0c716c04a1e37a14677682..37b5184f8aabedfc6c2b8dee2b0a2bd4d2342644 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
@@ -140,7 +140,7 @@ int FIREBIRD_STORE::CheckVersion()
 IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amRead, til, tlr);
 IBPP::Statement st = IBPP::StatementFactory(db, tr);
 
 IBPP::Transaction tr = IBPP::TransactionFactory(db, IBPP::amRead, til, tlr);
 IBPP::Statement st = IBPP::StatementFactory(db, tr);
 

-string name;
+std::string name;

 
 try
     {
 
 try
     {


@@ -157,7 +157,7 @@ try
             st->Get(1, schemaVersion);
         }
     tr->Commit();
             st->Get(1, schemaVersion);
         }
     tr->Commit();

-    WriteServLog("FIREBIRD_STORE: Current DB schema version: %d", schemaVersion);
+    logger("FIREBIRD_STORE: Current DB schema version: %d", schemaVersion);

     }
 
 catch (IBPP::Exception & ex)
     }
 
 catch (IBPP::Exception & ex)

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_users.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_users.cpp
index e48fd0d89dacb6effa5d245996b4480d9ad7265e..3f00b16bbd8517b0b81a852bb9844f34f372eadf 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_users.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_users.cpp
@@ -204,8 +204,8 @@ try
                         upload = ?, \
                         download = ? \
                      where fk_stat = ? and dir_num = ?");
                         upload = ?, \
                         download = ? \
                      where fk_stat = ? and dir_num = ?");

-        st->Set(1, (int64_t)stat.up[i]);
-        st->Set(2, (int64_t)stat.down[i]);
+        st->Set(1, (int64_t)stat.monthUp[i]);
+        st->Set(2, (int64_t)stat.monthDown[i]);

         st->Set(3, sid);
         st->Set(4, i);
         st->Execute();
         st->Set(3, sid);
         st->Set(4, i);
         st->Execute();


@@ -421,8 +421,8 @@ try
         if (st->Fetch())
             {
             st->Get(3, dir);
         if (st->Fetch())
             {
             st->Get(3, dir);

-            st->Get(5, (int64_t &)stat->up[dir]);
-            st->Get(4, (int64_t &)stat->down[dir]);
+            st->Get(5, (int64_t &)stat->monthUp[dir]);
+            st->Get(4, (int64_t &)stat->monthDown[dir]);

             }
         else
             {
             }
         else
             {

diff --git a/projects/stargazer/plugins/store/mysql/mysql_store.cpp b/projects/stargazer/plugins/store/mysql/mysql_store.cpp
index 11c2def3b5c1d2ca0dc3b82fb036fa6afcc00e71..53de158aa660986ab6f09e83477f3277bfa0b4bd 100644 (file)
--- a/projects/stargazer/plugins/store/mysql/mysql_store.cpp
+++ b/projects/stargazer/plugins/store/mysql/mysql_store.cpp
@@ -243,7 +243,7 @@ else
         }
         if (!ret)
         {
         }
         if (!ret)
         {

-            WriteServLog("MYSQL_STORE: Current DB schema version: %d", schemaVersion);
+            logger("MYSQL_STORE: Current DB schema version: %d", schemaVersion);

             MakeUpdates(sock);
         }
         mysql_close(sock);
             MakeUpdates(sock);
         }
         mysql_close(sock);


@@ -600,7 +600,7 @@ if (schemaVersion  < 1)
         return -1;
         }
     schemaVersion = 1;
         return -1;
         }
     schemaVersion = 1;

-    WriteServLog("MYSQL_STORE: Updated DB schema to version %d", schemaVersion);
+    logger("MYSQL_STORE: Updated DB schema to version %d", schemaVersion);

     }
 return 0;
 }
     }
 return 0;
 }


@@ -903,7 +903,7 @@ for (int i = 0; i < DIR_NUM; i++)
         mysql_close(sock);
         return -1;
         }
         mysql_close(sock);
         return -1;
         }

-    stat->down[i] = traff;
+    stat->monthDown[i] = traff;

 
     sprintf(s, "U%d", i);
     if (GetULongLongInt(row[startPos+i*2+1], &traff, 0) != 0)
 
     sprintf(s, "U%d", i);
     if (GetULongLongInt(row[startPos+i*2+1], &traff, 0) != 0)


@@ -913,7 +913,7 @@ for (int i = 0; i < DIR_NUM; i++)
         mysql_close(sock);
         return -1;
         }
         mysql_close(sock);
         return -1;
         }

-    stat->up[i] = traff;
+    stat->monthUp[i] = traff;

     }//for
 
 startPos += (2*DIR_NUM);
     }//for
 
 startPos += (2*DIR_NUM);


@@ -1033,10 +1033,10 @@ res = "UPDATE users SET";
 
 for (int i = 0; i < DIR_NUM; i++)
     {
 
 for (int i = 0; i < DIR_NUM; i++)
     {

-    strprintf(&param, " D%d=%lld,", i, stat.down[i]);
+    strprintf(&param, " D%d=%lld,", i, stat.monthDown[i]);

     res += param;
 
     res += param;
 

-    strprintf(&param, " U%d=%lld,", i, stat.up[i]);
+    strprintf(&param, " U%d=%lld,", i, stat.monthUp[i]);

     res += param;
     }
 
     res += param;
     }
 


@@ -1196,10 +1196,10 @@ strprintf(&res, "INSERT INTO stat SET login='%s', month=%d, year=%d,",
     
 for (int i = 0; i < DIR_NUM; i++)
     {
     
 for (int i = 0; i < DIR_NUM; i++)
     {

-    strprintf(&param, " U%d=%lld,", i, stat.up[i]); 
+    strprintf(&param, " U%d=%lld,", i, stat.monthUp[i]); 

     res += param;
 
     res += param;
 

-    strprintf(&param, " D%d=%lld,", i, stat.down[i]);        
+    strprintf(&param, " D%d=%lld,", i, stat.monthDown[i]);        

     res += param;
     }
     
     res += param;
     }
     

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
index 5b55f318a102117e550b22204531ffd6c9f53bf1..3a1d7272f1267d05ace0cb08fef059e184c8e5a3 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -237,7 +237,7 @@ if (CommitTransaction())
     return -1;
     }
 
     return -1;
     }
 

-WriteServLog("POSTGRESQL_STORE: Current DB schema version: %d", version);
+logger("POSTGRESQL_STORE: Current DB schema version: %d", version);

 
 return 0;
 }
 
 return 0;
 }

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 90ae01b96669043dfd2a1facf3afa9e0f88668d7..150f2a8bcf1fe8de324127b391f87f46c852e5e2 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -247,7 +247,6 @@ private:
     int             id;
     bool            __connected;
     USER_PROPERTY<bool> connected;
     int             id;
     bool            __connected;
     USER_PROPERTY<bool> connected;

-    std::string     lastDisconnectReason;

 
     bool            enabledDirs[DIR_NUM];
 
 
     bool            enabledDirs[DIR_NUM];