GetScriptDir -> GetScriptsDir

diff --git a/projects/stargazer/settings.cpp b/projects/stargazer/settings.cpp
index 7aa2950fa4fa83a44570134dd715a41090a0bc3e..c863fbbd9012465cd36af563d9c9e487893c675a 100644 (file)
--- a/projects/stargazer/settings.cpp
+++ b/projects/stargazer/settings.cpp
@@ -41,7 +41,7 @@ using namespace std;
 //-----------------------------------------------------------------------------
 SETTINGS::SETTINGS()
     : confDir("/etc/stargazer"),
 //-----------------------------------------------------------------------------
 SETTINGS::SETTINGS()
     : confDir("/etc/stargazer"),

-      scriptDir("/etc/stargazer"),
+      scriptsDir("/etc/stargazer"),

       pidFile("/var/run/stargazer.pid"),
       monitoring(false),
       detailStatWritePeriod(dsPeriod_1_6),
       pidFile("/var/run/stargazer.pid"),
       monitoring(false),
       detailStatWritePeriod(dsPeriod_1_6),


@@ -63,7 +63,7 @@ SETTINGS::SETTINGS()
 //-----------------------------------------------------------------------------
 SETTINGS::SETTINGS(const std::string & cd)
     : confDir(cd),
 //-----------------------------------------------------------------------------
 SETTINGS::SETTINGS(const std::string & cd)
     : confDir(cd),

-      scriptDir(cd),
+      scriptsDir(cd),

       monitoring(false),
       detailStatWritePeriod(dsPeriod_1_6),
       statWritePeriod(10),
       monitoring(false),
       detailStatWritePeriod(dsPeriod_1_6),
       statWritePeriod(10),


@@ -84,7 +84,7 @@ SETTINGS::SETTINGS(const std::string & cd)
 //-----------------------------------------------------------------------------
 SETTINGS::SETTINGS(const SETTINGS & rval)
     : confDir(rval.confDir),
 //-----------------------------------------------------------------------------
 SETTINGS::SETTINGS(const SETTINGS & rval)
     : confDir(rval.confDir),

-      scriptDir(rval.scriptDir),
+      scriptsDir(rval.scriptsDir),

       pidFile(rval.pidFile),
       monitoring(rval.monitoring),
       detailStatWritePeriod(dsPeriod_1_6),
       pidFile(rval.pidFile),
       monitoring(rval.monitoring),
       detailStatWritePeriod(dsPeriod_1_6),


@@ -258,7 +258,7 @@ while (node)
     {
     if (strcasecmp(node->getName(), "ScriptDir") == 0)
         {
     {
     if (strcasecmp(node->getName(), "ScriptDir") == 0)
         {

-        scriptDir = node->getValue(0);
+        scriptsDir = node->getValue(0);

         //printfd(__FILE__, "LogFile: %s\n", logFile.c_str());
         }
 
         //printfd(__FILE__, "LogFile: %s\n", logFile.c_str());
         }
 

diff --git a/projects/stargazer/settings.h b/projects/stargazer/settings.h
index 46d40694b6f7db26f9c3340d49a0731a969ff7f0..16a9d61b4b059a714a7c47df3bc87da8a550840a 100644 (file)
--- a/projects/stargazer/settings.h
+++ b/projects/stargazer/settings.h
@@ -70,7 +70,7 @@ public:
     unsigned            GetExecutersNum() const { return executersNum; }
     const std::string & GetDirName(int num) const { return dirName[num]; };
     const std::string & GetConfDir() const { return confDir; }
     unsigned            GetExecutersNum() const { return executersNum; }
     const std::string & GetDirName(int num) const { return dirName[num]; };
     const std::string & GetConfDir() const { return confDir; }

-    const std::string & GetScriptDir() const { return scriptDir; }
+    const std::string & GetScriptsDir() const { return scriptsDir; }

     const std::string & GetRulesFileName() const { return rules; }
     const std::string & GetLogFileName() const { return logFile; }
     const std::string & GetPIDFileName() const { return pidFile; }
     const std::string & GetRulesFileName() const { return rules; }
     const std::string & GetLogFileName() const { return logFile; }
     const std::string & GetPIDFileName() const { return pidFile; }


@@ -114,7 +114,7 @@ private:
     std::string modulesPath;
     std::string dirName[DIR_NUM];
     std::string confDir;
     std::string modulesPath;
     std::string dirName[DIR_NUM];
     std::string confDir;

-    std::string        scriptDir;
+    std::string        scriptsDir;

     std::string rules;
     std::string logFile;
     std::string pidFile;
     std::string rules;
     std::string logFile;
     std::string pidFile;