fixes for log parsing on mac

DDVTECH · Mar 3, 2022 · 06f0b86 · 06f0b86
1 parent 83bbac4
commit 06f0b86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/defines.h b/lib/defines.h
@@ -66,7 +66,7 @@ static const char *DBG_LVL_LIST[] ={"NONE", "FAIL", "ERROR", "WARN", "IN
 #if DEBUG >= DLVL_DEVEL
 #define DEBUG_MSG(lvl, msg, ...) \
  if (Util::printDebugLevel >= lvl){\
- fprintf(stderr, "%s|%s|%d|%s:%d|%s|" msg "\n", getprogname(), DBG_LVL_LIST[lvl], getpid(), __FILE__, \
+ fprintf(stderr, "%s|%s|%d|%s:%d|%s|" msg "\n", DBG_LVL_LIST[lvl], getprogname(),  getpid(), __FILE__, \
  __LINE__, Util::streamName, ##__VA_ARGS__); \
  }
 #else

diff --git a/src/controller/controller.cpp b/src/controller/controller.cpp
@@ -235,6 +235,9 @@ int main_loop(int argc, char **argv){
  // reload config from config file
  Controller::Storage = JSON::fromFile(Controller::conf.getString("configFile"));
 
+ // start push checking thread
+ tthread::thread pushThread(Controller::pushCheckLoop, 0);
+
  {// spawn thread that reads stderr of process
  std::string logPipe = Util::getTmpFolder() + "MstLog";
  if (mkfifo(logPipe.c_str(), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH) != 0){
@@ -538,8 +541,6 @@ int main_loop(int argc, char **argv){
  tthread::thread UDPAPIThread(Controller::handleUDPAPI, 0);
  // start monitoring thread /*LTS*/
  tthread::thread uplinkThread(Controller::uplinkConnection, 0); /*LTS*/
- // start push checking thread
- tthread::thread pushThread(Controller::pushCheckLoop, 0);
 #ifdef UPDATER
  // start updater thread
  tthread::thread updaterThread(Controller::updateThread, 0);