X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/f3555eaeee988c834b068f96bcc1ef7130b886de..ad0da4b1a6f6cf0afd5a234b1523bdbf0f6321d8:/projects/stargazer/main.cpp?ds=sidebyside
diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 09f0970f..1e4c677e 100644
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -106,7 +106,7 @@ else
}
}
//-----------------------------------------------------------------------------
-#ifdef LINUX
+#if defined(LINUX) || defined(DARWIN)
int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings)
#else
int StartScriptExecuter(char *, int msgKey, int * msgID, SETTINGS_IMPL * settings)
@@ -151,7 +151,7 @@ switch (executerPid)
case 0:
delete settings;
-#ifdef LINUX
+#if defined(LINUX) || defined(DARWIN)
Executer(*msgID, executerPid, procName);
#else
Executer(*msgID, executerPid);
@@ -160,7 +160,7 @@ switch (executerPid)
default:
if (executersPid.empty()) {
-#ifdef LINUX
+#if defined(LINUX) || defined(DARWIN)
Executer(*msgID, executerPid, NULL);
#else
Executer(*msgID, executerPid);
@@ -264,21 +264,13 @@ else
if (settings->ReadSettings())
{
STG_LOGGER & WriteServLog = GetStgLogger();
+
if (settings->GetLogFileName() != "")
WriteServLog.SetLogFileName(settings->GetLogFileName());
+
WriteServLog("ReadSettings error. %s", settings->GetStrError().c_str());
exit(1);
}
- /*************************************************************************************************/
- printfd(__FILE__, "--- Script params dump ---\n");
- std::vector<std::string>::const_iterator it(settings->GetScriptParams().begin());
- while (it != settings->GetScriptParams().end())
- {
- printfd(__FILE__, "%s\n", it->c_str());
- ++it;
- }
- printfd(__FILE__, "--- End dump ---\n");
- /*************************************************************************************************/
#ifndef NO_DAEMON
std::string startFile(settings->GetConfDir() + START_FILE);
#endif
@@ -471,7 +463,7 @@ while (true)
}
break;
default:
- WriteServLog("Ignore signel %d", sig);
+ WriteServLog("Ignore signal %d", sig);
break;
}
if (stop)