Merge branch 'master' into full-month-stats

[stg.git] / include / stg / user_property.h

diff --git a/include/stg/user_property.h b/include/stg/user_property.h
index 78e5675a5f9adc453ae5ac13f8c8e06922630477..fbd6aa4668ed2d351bfc6615badfeff3190aefdb 100644 (file)
--- a/include/stg/user_property.h
+++ b/include/stg/user_property.h
@@ -15,12 +15,13 @@ $Author: faust $
 #include <sstream>
 #include <iostream>
 
 #include <sstream>
 #include <iostream>
 

+#include "stg/logger.h"
+#include "stg/locker.h"
+#include "stg/scriptexecuter.h"
+

 #include "store.h"
 #include "admin.h"
 #include "notifer.h"
 #include "store.h"
 #include "admin.h"
 #include "notifer.h"

-#include "stg_logger.h"
-#include "stg_locker.h"
-#include "script_executer.h"

 #include "noncopyable.h"
 
 extern const volatile time_t stgTime;
 #include "noncopyable.h"
 
 extern const volatile time_t stgTime;


@@ -173,7 +174,10 @@ template <typename varT>
 inline
 USER_PROPERTY<varT>::USER_PROPERTY(varT & val)
     : value(val),
 inline
 USER_PROPERTY<varT>::USER_PROPERTY(varT & val)
     : value(val),

-      modificationTime(stgTime)
+      modificationTime(stgTime),
+      beforeNotifiers(),
+      afterNotifiers(),
+      mutex()

 {
 pthread_mutex_init(&mutex, NULL);
 }
 {
 pthread_mutex_init(&mutex, NULL);
 }


@@ -282,8 +286,6 @@ bool USER_PROPERTY_LOGGED<varT>::Set(const varT & val,
                                      const std::string & msg)
 {
 const PRIV * priv = admin->GetPriv();
                                      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) ||
 
 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() + "\"");
 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
     {
     }
 else
     {