From: Maxim Mamontov <faust.madf@gmail.com>
Date: Mon, 21 Mar 2011 10:53:42 +0000 (+0200)
Subject: GetScriptDir -> GetScriptsDir
X-Git-Tag: 2.407-rc3~143
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/d79d4186f459118147e9a234ebf0dab6c68b31d6?hp=91b5ae18ae465d0887785aab6dc0eb7abc0d5488

GetScriptDir -> GetScriptsDir
---

diff --git a/projects/stargazer/settings.cpp b/projects/stargazer/settings.cpp
index 7aa2950f..c863fbbd 100644
--- a/projects/stargazer/settings.cpp
+++ b/projects/stargazer/settings.cpp
@@ -41,7 +41,7 @@ using namespace std;
 //-----------------------------------------------------------------------------
 SETTINGS::SETTINGS()
     : confDir("/etc/stargazer"),
-      scriptDir("/etc/stargazer"),
+      scriptsDir("/etc/stargazer"),
       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),
-      scriptDir(cd),
+      scriptsDir(cd),
       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),
-      scriptDir(rval.scriptDir),
+      scriptsDir(rval.scriptsDir),
       pidFile(rval.pidFile),
       monitoring(rval.monitoring),
       detailStatWritePeriod(dsPeriod_1_6),
@@ -258,7 +258,7 @@ while (node)
     {
     if (strcasecmp(node->getName(), "ScriptDir") == 0)
         {
-        scriptDir = node->getValue(0);
+        scriptsDir = node->getValue(0);
         //printfd(__FILE__, "LogFile: %s\n", logFile.c_str());
         }
 
diff --git a/projects/stargazer/settings.h b/projects/stargazer/settings.h
index 46d40694..16a9d61b 100644
--- 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; }
-    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; }
@@ -114,7 +114,7 @@ private:
     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;