[NY] Removed commented out stuff.

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

diff --git a/projects/sgauthstress/main.cpp b/projects/sgauthstress/main.cpp
index 21df6d74f9ea4c7135afc5d6aaaae2301d2f5cc2..b0819c3c016bad9a2e163c6c96cc70f250fef511 100644 (file)
--- a/projects/sgauthstress/main.cpp
+++ b/projects/sgauthstress/main.cpp
@@ -28,6 +28,8 @@
 
 #include <csignal>
 #include <iostream>
 
 #include <csignal>
 #include <iostream>

+#include <vector>
+#include <list>

 
 #include "stg/common.h"
 #include "stg/store.h"
 
 #include "stg/common.h"
 #include "stg/store.h"


@@ -98,7 +100,7 @@ SetSignalHandlers();
 PROTO proto(settings.GetServerName(),
             settings.GetServerPort(),
             settings.GetLocalPort(),
 PROTO proto(settings.GetServerName(),
             settings.GetServerPort(),
             settings.GetLocalPort(),

-            1);
+            10);

 
 STORE_LOADER storeLoader(settings.GetModulesPath(), settings.GetStoreModuleSettings());
 if (storeLoader.Load())
 
 STORE_LOADER storeLoader(settings.GetModulesPath(), settings.GetStoreModuleSettings());
 if (storeLoader.Load())


@@ -116,23 +118,38 @@ if (dataStore->GetUsersList(&userList))
     return -1;
     }
 
     return -1;
     }
 

-std::vector<std::string>::const_iterator it;
-for (it = userList.begin(); it != userList.end(); ++it)
+std::list<uint32_t> ips;

     {
     {

-    USER_CONF userConf;
-    if (dataStore->RestoreUserConf(&userConf, *it))
+    std::vector<std::string>::const_iterator it;
+    for (it = userList.begin(); it != userList.end(); ++it)

         {
         {

-        std::cerr << "Failed to read user conf: '" << dataStore->GetStrError() << "'" << std::endl;
-        return -1;
+        USER_CONF userConf;
+        if (dataStore->RestoreUserConf(&userConf, *it))
+            {
+            std::cerr << "Failed to read user conf: '" << dataStore->GetStrError() << "'" << std::endl;
+            return -1;
+            }
+        proto.AddUser(
+                USER(
+                    *it,
+                    userConf.password,
+                    userConf.ips[0].ip
+                )
+        );
+        ips.push_back(userConf.ips[0].ip);

         }
         }

-    proto.AddUser(
-            USER(
-                *it,
-                userConf.password,
-                userConf.ips[0].ip
-            ),
-            true
-    );
+    }
+
+if (!proto.Start())
+    {
+    std::cerr << "Failed to start listening thread: '" << proto.GetStrError() << "'" << std::endl;
+    return -1;
+    }
+
+std::list<uint32_t>::const_iterator it;
+for (it = ips.begin(); it != ips.end(); ++it)
+    {
+    proto.Connect(*it);

     }
 
 std::cout << "Successfully loaded " << proto.UserCount() << " users" << std::endl;
     }
 
 std::cout << "Successfully loaded " << proto.UserCount() << " users" << std::endl;


@@ -140,9 +157,12 @@ std::cout << "Successfully loaded " << proto.UserCount() << " users" << std::end
 running = true;
 while (running)
     {
 running = true;
 while (running)
     {

-    usleep(200000);
+    struct timespec ts = {0, 200000000};
+    nanosleep(&ts, NULL);

     }
 
     }
 

+proto.Stop();
+

 storeLoader.Unload();
 
 return 0;
 storeLoader.Unload();
 
 return 0;