X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/90e389f6ec12e60a62c362296ffcf314feb5b03d..39c6313308afb248b140d98b8052f1b484549df2:/include/stg/user_property.h?ds=inline diff --git a/include/stg/user_property.h b/include/stg/user_property.h index 8b934167..fbd6aa46 100644 --- a/include/stg/user_property.h +++ b/include/stg/user_property.h @@ -15,12 +15,13 @@ $Author: faust $ #include #include +#include "stg/logger.h" +#include "stg/locker.h" +#include "stg/scriptexecuter.h" + #include "store.h" #include "admin.h" #include "notifer.h" -#include "logger.h" -#include "locker.h" -#include "script_executer.h" #include "noncopyable.h" extern const volatile time_t stgTime; @@ -173,7 +174,10 @@ template inline USER_PROPERTY::USER_PROPERTY(varT & val) : value(val), - modificationTime(stgTime) + modificationTime(stgTime), + beforeNotifiers(), + afterNotifiers(), + mutex() { pthread_mutex_init(&mutex, NULL); } @@ -282,8 +286,6 @@ bool USER_PROPERTY_LOGGED::Set(const varT & val, const std::string & msg) { const PRIV * priv = admin->GetPriv(); -std::string adm_login = admin->GetLogin(); -std::string adm_ip = admin->GetIPStr(); if ((priv->userConf && !isStat) || (priv->userStat && isStat) || @@ -363,7 +365,7 @@ std::string filePath = scriptsDir + "/OnChange"; if (access(filePath.c_str(), X_OK) == 0) { std::string execString("\"" + filePath + "\" \"" + login + "\" \"" + paramName + "\" \"" + oldValue + "\" \"" + newValue + "\" \"" + admin->GetLogin() + "\" \"" + admin->GetIPStr() + "\""); - ScriptExec(execString); + ScriptExec(execString.c_str()); } else {