Move strategy into job.

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

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index ca8f681fbbebb227a65e9266d4620ffed1a61c12..8cb9bee5b0e8b723d9c89a8470605e159f70d8c9 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -42,55 +42,45 @@ extern volatile time_t stgTime;
 using STG::UsersImpl;
 
 //-----------------------------------------------------------------------------
 using STG::UsersImpl;
 
 //-----------------------------------------------------------------------------

-UsersImpl::UsersImpl(SettingsImpl * s, Store * st,
-                    Tariffs * t, Services & svcs,
-                    const Admin& sa)
+UsersImpl::UsersImpl(SettingsImpl * s, Store * store,
+                    Tariffs * tariffs, Services & svcs,
+                    const Admin& sysAdmin)

     : settings(s),
     : settings(s),

-      tariffs(t),
+      m_tariffs(tariffs),

       m_services(svcs),
       m_services(svcs),

-      store(st),
-      sysAdmin(sa),
+      m_store(store),
+      m_sysAdmin(sysAdmin),

       WriteServLog(Logger::get()),
       WriteServLog(Logger::get()),

-      nonstop(false),

       isRunning(false),
       handle(0)
 {
       isRunning(false),
       handle(0)
 {

-pthread_mutexattr_t attr;
-pthread_mutexattr_init(&attr);
-pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-pthread_mutex_init(&mutex, &attr);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-UsersImpl::~UsersImpl()
+bool UsersImpl::FindByNameNonLock(const std::string & login, user_iter * user)

 {
 {

-pthread_mutex_destroy(&mutex);
-}
-//-----------------------------------------------------------------------------
-int UsersImpl::FindByNameNonLock(const std::string & login, user_iter * user)
-{
-const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
+const auto iter = loginIndex.find(login);

 if (iter == loginIndex.end())
 if (iter == loginIndex.end())

-    return -1;
-if (user)
+    return false;
+if (user != nullptr)

     *user = iter->second;
     *user = iter->second;

-return 0;
+return true;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-int UsersImpl::FindByNameNonLock(const std::string & login, const_user_iter * user) const
+bool UsersImpl::FindByNameNonLock(const std::string & login, const_user_iter * user) const

 {
 {

-const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
+const auto iter = loginIndex.find(login);

 if (iter == loginIndex.end())
 if (iter == loginIndex.end())

-    return -1;
-if (user)
+    return false;
+if (user != nullptr)

     *user = iter->second;
     *user = iter->second;

-return 0;
+return true;

 }
 //-----------------------------------------------------------------------------
 int UsersImpl::FindByName(const std::string & login, UserPtr * user)
 {
 }
 //-----------------------------------------------------------------------------
 int UsersImpl::FindByName(const std::string & login, UserPtr * user)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 user_iter u;
 user_iter u;

-if (FindByNameNonLock(login, &u))
+if (!FindByNameNonLock(login, &u))

     return -1;
 *user = &(*u);
 return 0;
     return -1;
 *user = &(*u);
 return 0;


@@ -98,9 +88,9 @@ return 0;
 //-----------------------------------------------------------------------------
 int UsersImpl::FindByName(const std::string & login, ConstUserPtr * user) const
 {
 //-----------------------------------------------------------------------------
 int UsersImpl::FindByName(const std::string & login, ConstUserPtr * user) const
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 const_user_iter u;
 const_user_iter u;

-if (FindByNameNonLock(login, &u))
+if (!FindByNameNonLock(login, &u))

     return -1;
 *user = &(*u);
 return 0;
     return -1;
 *user = &(*u);
 return 0;


@@ -108,16 +98,15 @@ return 0;
 //-----------------------------------------------------------------------------
 bool UsersImpl::Exists(const std::string & login) const
 {
 //-----------------------------------------------------------------------------
 bool UsersImpl::Exists(const std::string & login) const
 {

-STG_LOCKER lock(&mutex);
-const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
+std::lock_guard<std::mutex> lock(m_mutex);
+const auto iter = loginIndex.find(login);

 return iter != loginIndex.end();
 }
 //-----------------------------------------------------------------------------
 bool UsersImpl::TariffInUse(const std::string & tariffName) const
 {
 return iter != loginIndex.end();
 }
 //-----------------------------------------------------------------------------
 bool UsersImpl::TariffInUse(const std::string & tariffName) const
 {

-STG_LOCKER lock(&mutex);
-std::list<UserImpl>::const_iterator iter;
-iter = users.begin();
+std::lock_guard<std::mutex> lock(m_mutex);
+auto iter = users.begin();

 while (iter != users.end())
     {
     if (iter->GetProperties().tariffName.Get() == tariffName)
 while (iter != users.end())
     {
     if (iter->GetProperties().tariffName.Get() == tariffName)


@@ -129,20 +118,20 @@ return false;
 //-----------------------------------------------------------------------------
 int UsersImpl::Add(const std::string & login, const Admin * admin)
 {
 //-----------------------------------------------------------------------------
 int UsersImpl::Add(const std::string & login, const Admin * admin)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 const auto& priv = admin->priv();
 
 const auto& priv = admin->priv();
 

-if (!priv.userAddDel)
+if (priv.userAddDel == 0)

     {
     WriteServLog("%s tried to add user \'%s\'. Access denied.",
                  admin->logStr().c_str(), login.c_str());
     return -1;
     }
 
     {
     WriteServLog("%s tried to add user \'%s\'. Access denied.",
                  admin->logStr().c_str(), login.c_str());
     return -1;
     }
 

-if (store->AddUser(login))
+if (m_store->AddUser(login) != 0)

     return -1;
 
     return -1;
 

-UserImpl u(settings, store, tariffs, &sysAdmin, this, m_services);
+UserImpl u(settings, m_store, m_tariffs, &m_sysAdmin, this, m_services);

 
 u.SetLogin(login);
 
 
 u.SetLogin(login);
 


@@ -162,7 +151,7 @@ AddUserIntoIndexes(users.begin());
 
     {
     // Fire all "on add" notifiers
 
     {
     // Fire all "on add" notifiers

-    std::set<NotifierBase<UserPtr> *>::iterator ni = onAddNotifiers.begin();
+    auto ni = onAddNotifiers.begin();

     while (ni != onAddNotifiers.end())
         {
         (*ni)->Notify(&users.front());
     while (ni != onAddNotifiers.end())
         {
         (*ni)->Notify(&users.front());


@@ -172,7 +161,7 @@ AddUserIntoIndexes(users.begin());
 
     {
     // Fire all "on add" implementation notifiers
 
     {
     // Fire all "on add" implementation notifiers

-    std::set<NotifierBase<UserImplPtr> *>::iterator ni = onAddNotifiersImpl.begin();
+    auto ni = onAddNotifiersImpl.begin();

     while (ni != onAddNotifiersImpl.end())
         {
         (*ni)->Notify(&users.front());
     while (ni != onAddNotifiersImpl.end())
         {
         (*ni)->Notify(&users.front());


@@ -188,7 +177,7 @@ void UsersImpl::Del(const std::string & login, const Admin * admin)
 const auto& priv = admin->priv();
 user_iter u;
 
 const auto& priv = admin->priv();
 user_iter u;
 

-if (!priv.userAddDel)
+if (priv.userAddDel == 0)

     {
     WriteServLog("%s tried to remove user \'%s\'. Access denied.",
                  admin->logStr().c_str(), login.c_str());
     {
     WriteServLog("%s tried to remove user \'%s\'. Access denied.",
                  admin->logStr().c_str(), login.c_str());


@@ -197,9 +186,9 @@ if (!priv.userAddDel)
 
 
     {
 
 
     {

-    STG_LOCKER lock(&mutex);
+    std::lock_guard<std::mutex> lock(m_mutex);

 
 

-    if (FindByNameNonLock(login, &u))
+    if (!FindByNameNonLock(login, &u))

         {
         WriteServLog("%s tried to delete user \'%s\': not found.",
                      admin->logStr().c_str(),
         {
         WriteServLog("%s tried to delete user \'%s\': not found.",
                      admin->logStr().c_str(),


@@ -211,7 +200,7 @@ if (!priv.userAddDel)
     }
 
     {
     }
 
     {

-    std::set<NotifierBase<UserPtr> *>::iterator ni = onDelNotifiers.begin();
+    auto ni = onDelNotifiers.begin();

     while (ni != onDelNotifiers.end())
         {
         (*ni)->Notify(&(*u));
     while (ni != onDelNotifiers.end())
         {
         (*ni)->Notify(&(*u));


@@ -220,7 +209,7 @@ if (!priv.userAddDel)
     }
 
     {
     }
 
     {

-    std::set<NotifierBase<UserImplPtr> *>::iterator ni = onDelNotifiersImpl.begin();
+    auto ni = onDelNotifiersImpl.begin();

     while (ni != onDelNotifiersImpl.end())
         {
         (*ni)->Notify(&(*u));
     while (ni != onDelNotifiersImpl.end())
         {
         (*ni)->Notify(&(*u));


@@ -229,7 +218,7 @@ if (!priv.userAddDel)
     }
 
     {
     }
 
     {

-    STG_LOCKER lock(&mutex);
+    std::lock_guard<std::mutex> lock(m_mutex);

 
     u->OnDelete();
 
 
     u->OnDelete();
 


@@ -250,8 +239,8 @@ bool UsersImpl::Authorize(const std::string & login, uint32_t ip,
                            uint32_t enabledDirs, const Auth * auth)
 {
 user_iter iter;
                            uint32_t enabledDirs, const Auth * auth)
 {
 user_iter iter;

-STG_LOCKER lock(&mutex);
-if (FindByNameNonLock(login, &iter))
+std::lock_guard<std::mutex> lock(m_mutex);
+if (!FindByNameNonLock(login, &iter))

     {
     WriteServLog("Attempt to authorize non-existant user '%s'", login.c_str());
     return false;
     {
     WriteServLog("Attempt to authorize non-existant user '%s'", login.c_str());
     return false;


@@ -266,12 +255,10 @@ if (FindByIPIdx(ip, iter))
                      iter->GetLogin().c_str());
         return false;
         }
                      iter->GetLogin().c_str());
         return false;
         }

-    if (iter->Authorize(ip, enabledDirs, auth))
-        return false;
-    return true;
+    return iter->Authorize(ip, enabledDirs, auth) == 0;

     }
 
     }
 

-if (iter->Authorize(ip, enabledDirs, auth))
+if (iter->Authorize(ip, enabledDirs, auth) != 0)

     return false;
 
 AddToIPIdx(iter);
     return false;
 
 AddToIPIdx(iter);


@@ -283,8 +270,8 @@ bool UsersImpl::Unauthorize(const std::string & login,
                              const std::string & reason)
 {
 user_iter iter;
                              const std::string & reason)
 {
 user_iter iter;

-STG_LOCKER lock(&mutex);
-if (FindByNameNonLock(login, &iter))
+std::lock_guard<std::mutex> lock(m_mutex);
+if (!FindByNameNonLock(login, &iter))

     {
     WriteServLog("Attempt to unauthorize non-existant user '%s'", login.c_str());
     printfd(__FILE__, "Attempt to unauthorize non-existant user '%s'", login.c_str());
     {
     WriteServLog("Attempt to unauthorize non-existant user '%s'", login.c_str());
     printfd(__FILE__, "Attempt to unauthorize non-existant user '%s'", login.c_str());


@@ -295,7 +282,7 @@ uint32_t ip = iter->GetCurrIP();
 
 iter->Unauthorize(auth, reason);
 
 
 iter->Unauthorize(auth, reason);
 

-if (!iter->GetAuthorized())
+if (iter->GetAuthorized() == 0)

     DelFromIPIdx(ip);
 
 return true;
     DelFromIPIdx(ip);
 
 return true;


@@ -305,20 +292,20 @@ int UsersImpl::ReadUsers()
 {
 std::vector<std::string> usersList;
 usersList.clear();
 {
 std::vector<std::string> usersList;
 usersList.clear();

-if (store->GetUsersList(&usersList) < 0)
+if (m_store->GetUsersList(&usersList) < 0)

     {
     {

-    WriteServLog(store->GetStrError().c_str());
+    WriteServLog(m_store->GetStrError().c_str());

     return -1;
     }
 
 user_iter ui;
 
 unsigned errors = 0;
     return -1;
     }
 
 user_iter ui;
 
 unsigned errors = 0;

-for (unsigned int i = 0; i < usersList.size(); i++)
+for (const auto& user : usersList)

     {
     {

-    UserImpl u(settings, store, tariffs, &sysAdmin, this, m_services);
+    UserImpl u(settings, m_store, m_tariffs, &m_sysAdmin, this, m_services);

 
 

-    u.SetLogin(usersList[i]);
+    u.SetLogin(user);

     users.push_front(u);
     ui = users.begin();
 
     users.push_front(u);
     ui = users.begin();
 


@@ -347,14 +334,13 @@ if (errors > 0)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-void * UsersImpl::Run(void * d)
+void UsersImpl::Run(std::stop_token token)

 {
 sigset_t signalSet;
 sigfillset(&signalSet);
 {
 sigset_t signalSet;
 sigfillset(&signalSet);

-pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+pthread_sigmask(SIG_BLOCK, &signalSet, nullptr);

 
 printfd(__FILE__, "=====================| pid: %d |===================== \n", getpid());
 
 printfd(__FILE__, "=====================| pid: %d |===================== \n", getpid());

-UsersImpl * us = static_cast<UsersImpl *>(d);

 
 struct tm t;
 time_t tt = stgTime;
 
 struct tm t;
 time_t tt = stgTime;


@@ -366,16 +352,16 @@ int day = t.tm_mday;
 printfd(__FILE__,"Day = %d Min = %d\n", day, min);
 
 time_t touchTime = stgTime - MONITOR_TIME_DELAY_SEC;
 printfd(__FILE__,"Day = %d Min = %d\n", day, min);
 
 time_t touchTime = stgTime - MONITOR_TIME_DELAY_SEC;

-std::string monFile = us->settings->GetMonitorDir() + "/users_r";
-printfd(__FILE__, "Monitor=%d file USERS %s\n", us->settings->GetMonitoring(), monFile.c_str());
+std::string monFile = settings->GetMonitorDir() + "/users_r";
+printfd(__FILE__, "Monitor=%d file USERS %s\n", settings->GetMonitoring(), monFile.c_str());

 
 

-us->isRunning = true;
-while (us->nonstop)
+isRunning = true;
+while (!token.stop_requested())

     {
     //printfd(__FILE__,"New Minute. old = %02d current = %02d\n", min, t->tm_min);
     //printfd(__FILE__,"New Day.    old = %2d current = %2d\n", day, t->tm_mday);
 
     {
     //printfd(__FILE__,"New Minute. old = %02d current = %02d\n", min, t->tm_min);
     //printfd(__FILE__,"New Day.    old = %2d current = %2d\n", day, t->tm_mday);
 

-    for_each(us->users.begin(), us->users.end(), [](auto& user){ user.Run(); });
+    for_each(users.begin(), users.end(), [](auto& user){ user.Run(); });

 
     tt = stgTime;
     localtime_r(&tt, &t);
 
     tt = stgTime;
     localtime_r(&tt, &t);


@@ -386,7 +372,7 @@ while (us->nonstop)
         printfd(__FILE__,"New Minute. old = %d current = %d\n", min, t.tm_min);
         min = t.tm_min;
 
         printfd(__FILE__,"New Minute. old = %d current = %d\n", min, t.tm_min);
         min = t.tm_min;
 

-        us->NewMinute(t);
+        NewMinute(t);

         }
 
     if (day != t.tm_mday)
         }
 
     if (day != t.tm_mday)


@@ -394,10 +380,10 @@ while (us->nonstop)
         printfd(__FILE__,"Sec = %d\n", stgTime);
         printfd(__FILE__,"New Day. old = %d current = %d\n", day, t.tm_mday);
         day = t.tm_mday;
         printfd(__FILE__,"Sec = %d\n", stgTime);
         printfd(__FILE__,"New Day. old = %d current = %d\n", day, t.tm_mday);
         day = t.tm_mday;

-        us->NewDay(t);
+        NewDay(t);

         }
 
         }
 

-    if (us->settings->GetMonitoring() && (touchTime + MONITOR_TIME_DELAY_SEC <= stgTime))
+    if (settings->GetMonitoring() && (touchTime + MONITOR_TIME_DELAY_SEC <= stgTime))

         {
         //printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", tc->monitoring, monFile.c_str());
         touchTime = stgTime;
         {
         //printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", tc->monitoring, monFile.c_str());
         touchTime = stgTime;


@@ -405,19 +391,18 @@ while (us->nonstop)
         }
 
     stgUsleep(100000);
         }
 
     stgUsleep(100000);

-    } //while (us->nonstop)
+    }

 
 

-std::list<USER_TO_DEL>::iterator iter(us->usersToDelete.begin());
-while (iter != us->usersToDelete.end())
+auto iter = usersToDelete.begin();
+while (iter != usersToDelete.end())

     {
     iter->delTime -= 2 * userDeleteDelayTime;
     ++iter;
     }
     {
     iter->delTime -= 2 * userDeleteDelayTime;
     ++iter;
     }

-us->RealDelUser();
+RealDelUser();

 
 

-us->isRunning = false;
+isRunning = false;

 
 

-return NULL;

 }
 //-----------------------------------------------------------------------------
 void UsersImpl::NewMinute(const struct tm & t)
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::NewMinute(const struct tm & t)


@@ -434,8 +419,7 @@ if (TimeToWriteDetailStat(t))
     //printfd(__FILE__, "USER::WriteInetStat\n");
     int usersCnt = 0;
 
     //printfd(__FILE__, "USER::WriteInetStat\n");
     int usersCnt = 0;
 

-    // ðÉÛÅÍ ÀÚÅÒÏ× ÞÁÓÔÑÍÉ. ÷ ÐÅÒÅÒÙ×ÁÈ ×ÙÚÙ×ÁÅÍ USER::Run
-    std::list<UserImpl>::iterator usr = users.begin();
+    auto usr = users.begin();

     while (usr != users.end())
         {
         usersCnt++;
     while (usr != users.end())
         {
         usersCnt++;


@@ -496,7 +480,7 @@ if (settings->GetDayFeeIsLastDay())
 //-----------------------------------------------------------------------------
 void UsersImpl::DayResetTraff(const struct tm & t1)
 {
 //-----------------------------------------------------------------------------
 void UsersImpl::DayResetTraff(const struct tm & t1)
 {

-int dayResetTraff = settings->GetDayResetTraff();
+auto dayResetTraff = settings->GetDayResetTraff();

 if (dayResetTraff == 0)
     dayResetTraff = DaysInCurrentMonth();
 if (t1.tm_mday == dayResetTraff)
 if (dayResetTraff == 0)
     dayResetTraff = DaysInCurrentMonth();
 if (t1.tm_mday == dayResetTraff)


@@ -509,18 +493,13 @@ if (t1.tm_mday == dayResetTraff)
 //-----------------------------------------------------------------------------
 int UsersImpl::Start()
 {
 //-----------------------------------------------------------------------------
 int UsersImpl::Start()
 {

-if (ReadUsers())
+if (ReadUsers() != 0)

     {
     WriteServLog("USERS: Error: Cannot read users!");
     return -1;
     }
 
     {
     WriteServLog("USERS: Error: Cannot read users!");
     return -1;
     }
 

-nonstop = true;
-if (pthread_create(&thread, NULL, Run, this))
-    {
-    WriteServLog("USERS: Error: Cannot start thread!");
-    return -1;
-    }
+m_thread = std::jthread([this](auto token){ Run(std::move(token)); });

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


@@ -528,13 +507,7 @@ int UsersImpl::Stop()
 {
 printfd(__FILE__, "USERS::Stop()\n");
 
 {
 printfd(__FILE__, "USERS::Stop()\n");
 

-if (!isRunning)
-    {
-    //printfd(__FILE__, "Alredy stopped\n");
-    return 0;
-    }
-
-nonstop = false;
+m_thread.request_stop();

 
 //5 seconds to thread stops itself
 struct timespec ts = {0, 200000000};
 
 //5 seconds to thread stops itself
 struct timespec ts = {0, 200000000};


@@ -543,31 +516,24 @@ for (size_t i = 0; i < 25 * (users.size() / 50 + 1); i++)
     if (!isRunning)
         break;
 
     if (!isRunning)
         break;
 

-    nanosleep(&ts, NULL);
+    nanosleep(&ts, nullptr);

     }
 
 //after 5 seconds waiting thread still running. now kill it
 if (isRunning)
     {
     }
 
 //after 5 seconds waiting thread still running. now kill it
 if (isRunning)
     {

-    printfd(__FILE__, "kill USERS thread.\n");
+    printfd(__FILE__, "Detach USERS thread.\n");

     //TODO pthread_cancel()
     //TODO pthread_cancel()

-    if (pthread_kill(thread, SIGINT))
-        {
-        //errorStr = "Cannot kill USERS thread.";
-        //printfd(__FILE__, "Cannot kill USERS thread.\n");
-        //return 0;
-        }
-    printfd(__FILE__, "USERS killed\n");
+    m_thread.detach();

     }
     }

+else
+    m_thread.join();

 
 printfd(__FILE__, "Before USERS::Run()\n");
 for_each(users.begin(), users.end(), [](auto& user){ user.Run(); });
 
 
 printfd(__FILE__, "Before USERS::Run()\n");
 for_each(users.begin(), users.end(), [](auto& user){ user.Run(); });
 

-// 'cause bind2st accepts only constant first param
-for (std::list<UserImpl>::iterator it = users.begin();
-     it != users.end();
-     ++it)
-    it->WriteDetailStat(true);
+for (auto& user : users)
+    user.WriteDetailStat(true);

 
 for_each(users.begin(), users.end(), [](auto& user){ user.WriteStat(); });
 //for_each(users.begin(), users.end(), mem_fun_ref(&UserImpl::WriteConf));
 
 for_each(users.begin(), users.end(), [](auto& user){ user.WriteStat(); });
 //for_each(users.begin(), users.end(), mem_fun_ref(&UserImpl::WriteConf));


@@ -578,19 +544,18 @@ return 0;
 //-----------------------------------------------------------------------------
 void UsersImpl::RealDelUser()
 {
 //-----------------------------------------------------------------------------
 void UsersImpl::RealDelUser()
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 
 printfd(__FILE__, "RealDelUser() users to del: %d\n", usersToDelete.size());
 
 
 printfd(__FILE__, "RealDelUser() users to del: %d\n", usersToDelete.size());
 

-std::list<USER_TO_DEL>::iterator iter;
-iter = usersToDelete.begin();
+auto iter = usersToDelete.begin();

 while (iter != usersToDelete.end())
     {
     printfd(__FILE__, "RealDelUser() user=%s\n", iter->iter->GetLogin().c_str());
     if (iter->delTime + userDeleteDelayTime < stgTime)
         {
         printfd(__FILE__, "RealDelUser() user=%s removed from DB\n", iter->iter->GetLogin().c_str());
 while (iter != usersToDelete.end())
     {
     printfd(__FILE__, "RealDelUser() user=%s\n", iter->iter->GetLogin().c_str());
     if (iter->delTime + userDeleteDelayTime < stgTime)
         {
         printfd(__FILE__, "RealDelUser() user=%s removed from DB\n", iter->iter->GetLogin().c_str());

-        if (store->DelUser(iter->iter->GetLogin()))
+        if (m_store->DelUser(iter->iter->GetLogin()) != 0)

             {
             WriteServLog("Error removing user \'%s\' from database.", iter->iter->GetLogin().c_str());
             }
             {
             WriteServLog("Error removing user \'%s\' from database.", iter->iter->GetLogin().c_str());
             }


@@ -602,7 +567,6 @@ while (iter != usersToDelete.end())
         ++iter;
         }
     }
         ++iter;
         }
     }

-return;

 }
 //-----------------------------------------------------------------------------
 void UsersImpl::AddToIPIdx(user_iter user)
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::AddToIPIdx(user_iter user)


@@ -610,14 +574,12 @@ void UsersImpl::AddToIPIdx(user_iter user)
 printfd(__FILE__, "USERS: Add IP Idx\n");
 uint32_t ip = user->GetCurrIP();
 //assert(ip && "User has non-null ip");
 printfd(__FILE__, "USERS: Add IP Idx\n");
 uint32_t ip = user->GetCurrIP();
 //assert(ip && "User has non-null ip");

-if (!ip)
+if (ip == 0)

     return; // User has disconnected
 
     return; // User has disconnected
 

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 
 

-const std::map<uint32_t, user_iter>::iterator it(
-        ipIndex.lower_bound(ip)
-);
+const auto it = ipIndex.lower_bound(ip);

 
 assert((it == ipIndex.end() || it->first != ip) && "User is not in index");
 
 
 assert((it == ipIndex.end() || it->first != ip) && "User is not in index");
 


@@ -629,11 +591,9 @@ void UsersImpl::DelFromIPIdx(uint32_t ip)
 printfd(__FILE__, "USERS: Del IP Idx\n");
 assert(ip && "User has non-null ip");
 
 printfd(__FILE__, "USERS: Del IP Idx\n");
 assert(ip && "User has non-null ip");
 

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 
 

-const std::map<uint32_t, user_iter>::iterator it(
-        ipIndex.find(ip)
-);
+const auto it = ipIndex.find(ip);

 
 if (it == ipIndex.end())
     return;
 
 if (it == ipIndex.end())
     return;


@@ -643,35 +603,35 @@ ipIndex.erase(it);
 //-----------------------------------------------------------------------------
 bool UsersImpl::FindByIPIdx(uint32_t ip, user_iter & iter) const
 {
 //-----------------------------------------------------------------------------
 bool UsersImpl::FindByIPIdx(uint32_t ip, user_iter & iter) const
 {

-std::map<uint32_t, user_iter>::const_iterator it(ipIndex.find(ip));
+auto it = ipIndex.find(ip);

 if (it == ipIndex.end())
     return false;
 iter = it->second;
 return true;
 }
 //-----------------------------------------------------------------------------
 if (it == ipIndex.end())
     return false;
 iter = it->second;
 return true;
 }
 //-----------------------------------------------------------------------------

-int UsersImpl::FindByIPIdx(uint32_t ip, UserPtr * usr) const
+int UsersImpl::FindByIPIdx(uint32_t ip, UserPtr * user) const

 {
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 
 user_iter iter;
 if (FindByIPIdx(ip, iter))
     {
 
 user_iter iter;
 if (FindByIPIdx(ip, iter))
     {

-    *usr = &(*iter);
+    *user = &(*iter);

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

-int UsersImpl::FindByIPIdx(uint32_t ip, UserImpl ** usr) const
+int UsersImpl::FindByIPIdx(uint32_t ip, UserImpl ** user) const

 {
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 
 user_iter iter;
 if (FindByIPIdx(ip, iter))
     {
 
 user_iter iter;
 if (FindByIPIdx(ip, iter))
     {

-    *usr = &(*iter);
+    *user = &(*iter);

     return 0;
     }
 
     return 0;
     }
 


@@ -680,25 +640,22 @@ return -1;
 //-----------------------------------------------------------------------------
 bool UsersImpl::IsIPInIndex(uint32_t ip) const
 {
 //-----------------------------------------------------------------------------
 bool UsersImpl::IsIPInIndex(uint32_t ip) const
 {

-STG_LOCKER lock(&mutex);
-
-std::map<uint32_t, user_iter>::const_iterator it(ipIndex.find(ip));
+std::lock_guard<std::mutex> lock(m_mutex);

 
 

-return it != ipIndex.end();
+return ipIndex.find(ip) != ipIndex.end();

 }
 //-----------------------------------------------------------------------------
 bool UsersImpl::IsIPInUse(uint32_t ip, const std::string & login, ConstUserPtr * user) const
 {
 }
 //-----------------------------------------------------------------------------
 bool UsersImpl::IsIPInUse(uint32_t ip, const std::string & login, ConstUserPtr * user) const
 {

-STG_LOCKER lock(&mutex);
-std::list<UserImpl>::const_iterator iter;
-iter = users.begin();
+std::lock_guard<std::mutex> lock(m_mutex);
+auto iter = users.begin();

 while (iter != users.end())
     {
     if (iter->GetLogin() != login &&
         !iter->GetProperties().ips.Get().isAnyIP() &&
         iter->GetProperties().ips.Get().find(ip))
         {
 while (iter != users.end())
     {
     if (iter->GetLogin() != login &&
         !iter->GetProperties().ips.Get().isAnyIP() &&
         iter->GetProperties().ips.Get().find(ip))
         {

-        if (user != NULL)
+        if (user != nullptr)

             *user = &(*iter);
         return true;
         }
             *user = &(*iter);
         return true;
         }


@@ -709,55 +666,55 @@ return false;
 //-----------------------------------------------------------------------------
 void UsersImpl::AddNotifierUserAdd(NotifierBase<UserPtr> * n)
 {
 //-----------------------------------------------------------------------------
 void UsersImpl::AddNotifierUserAdd(NotifierBase<UserPtr> * n)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 onAddNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::DelNotifierUserAdd(NotifierBase<UserPtr> * n)
 {
 onAddNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::DelNotifierUserAdd(NotifierBase<UserPtr> * n)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 onAddNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::AddNotifierUserDel(NotifierBase<UserPtr> * n)
 {
 onAddNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::AddNotifierUserDel(NotifierBase<UserPtr> * n)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 onDelNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::DelNotifierUserDel(NotifierBase<UserPtr> * n)
 {
 onDelNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::DelNotifierUserDel(NotifierBase<UserPtr> * n)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 onDelNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::AddNotifierUserAdd(NotifierBase<UserImplPtr> * n)
 {
 onDelNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::AddNotifierUserAdd(NotifierBase<UserImplPtr> * n)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 onAddNotifiersImpl.insert(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::DelNotifierUserAdd(NotifierBase<UserImplPtr> * n)
 {
 onAddNotifiersImpl.insert(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::DelNotifierUserAdd(NotifierBase<UserImplPtr> * n)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 onAddNotifiersImpl.erase(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::AddNotifierUserDel(NotifierBase<UserImplPtr> * n)
 {
 onAddNotifiersImpl.erase(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::AddNotifierUserDel(NotifierBase<UserImplPtr> * n)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 onDelNotifiersImpl.insert(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::DelNotifierUserDel(NotifierBase<UserImplPtr> * n)
 {
 onDelNotifiersImpl.insert(n);
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::DelNotifierUserDel(NotifierBase<UserImplPtr> * n)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 onDelNotifiersImpl.erase(n);
 }
 //-----------------------------------------------------------------------------
 onDelNotifiersImpl.erase(n);
 }
 //-----------------------------------------------------------------------------

-int UsersImpl::OpenSearch()
+unsigned int UsersImpl::OpenSearch()

 {
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 handle++;
 searchDescriptors[handle] = users.begin();
 return handle;
 handle++;
 searchDescriptors[handle] = users.begin();
 return handle;


@@ -765,8 +722,8 @@ return handle;
 //-----------------------------------------------------------------------------
 int UsersImpl::SearchNext(int h, UserPtr * user)
 {
 //-----------------------------------------------------------------------------
 int UsersImpl::SearchNext(int h, UserPtr * user)
 {

-    UserImpl * ptr = NULL;
-    if (SearchNext(h, &ptr))
+    UserImpl * ptr = nullptr;
+    if (SearchNext(h, &ptr) != 0)

         return -1;
     *user = ptr;
     return 0;
         return -1;
     *user = ptr;
     return 0;


@@ -774,7 +731,7 @@ int UsersImpl::SearchNext(int h, UserPtr * user)
 //-----------------------------------------------------------------------------
 int UsersImpl::SearchNext(int h, UserImpl ** user)
 {
 //-----------------------------------------------------------------------------
 int UsersImpl::SearchNext(int h, UserImpl ** user)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 
 if (searchDescriptors.find(h) == searchDescriptors.end())
     {
 
 if (searchDescriptors.find(h) == searchDescriptors.end())
     {


@@ -803,7 +760,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int UsersImpl::CloseSearch(int h)
 {
 //-----------------------------------------------------------------------------
 int UsersImpl::CloseSearch(int h)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 if (searchDescriptors.find(h) != searchDescriptors.end())
     {
     searchDescriptors.erase(searchDescriptors.find(h));
 if (searchDescriptors.find(h) != searchDescriptors.end())
     {
     searchDescriptors.erase(searchDescriptors.find(h));


@@ -816,19 +773,19 @@ return -1;
 //-----------------------------------------------------------------------------
 void UsersImpl::AddUserIntoIndexes(user_iter user)
 {
 //-----------------------------------------------------------------------------
 void UsersImpl::AddUserIntoIndexes(user_iter user)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 loginIndex.insert(make_pair(user->GetLogin(), user));
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::DelUserFromIndexes(user_iter user)
 {
 loginIndex.insert(make_pair(user->GetLogin(), user));
 }
 //-----------------------------------------------------------------------------
 void UsersImpl::DelUserFromIndexes(user_iter user)
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);

 loginIndex.erase(user->GetLogin());
 }
 //-----------------------------------------------------------------------------
 bool UsersImpl::TimeToWriteDetailStat(const struct tm & t)
 {
 loginIndex.erase(user->GetLogin());
 }
 //-----------------------------------------------------------------------------
 bool UsersImpl::TimeToWriteDetailStat(const struct tm & t)
 {

-int statTime = settings->GetDetailStatWritePeriod();
+auto statTime = settings->GetDetailStatWritePeriod();

 
 switch (statTime)
     {
 
 switch (statTime)
     {