Procházet zdrojové kódy

Merge pull request #13809 from ghalliday/issue24146

HPCC-24146 Prevent dali from logging most messages from other components

Reviewed-By: Rodrigo Pastrana <rodrigo.pastrana@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman před 5 roky
rodič
revize
eb373cab8f
2 změnil soubory, kde provedl 2 přidání a 3 odebrání
  1. 0 2
      dali/server/daserver.cpp
  2. 2 1
      system/jlib/jlog.cpp

+ 0 - 2
dali/server/daserver.cpp

@@ -616,8 +616,6 @@ int main(int argc, const char* argv[])
         mpServer->installWhiteListCallback(whiteListHandler);
 #ifndef _CONTAINERIZED
         setMsgLevel(fileMsgHandler, serverConfig->getPropInt("SDS/@msgLevel", 100));
-#else
-        setupContainerizedLogMsgHandler();
 #endif
         startLogMsgChildReceiver(); 
         startLogMsgParentReceiver();

+ 2 - 1
system/jlib/jlog.cpp

@@ -2379,7 +2379,8 @@ void setupContainerizedLogMsgHandler()
             if (!isEmptyString(logAudiences))
                 msgAudiences = logMsgAudsFromAbbrevs(logAudiences);
 
-            Owned<ILogMsgFilter> filter = getCategoryLogMsgFilter(msgAudiences, msgClasses, logDetail);
+            const bool local = true; // Do not include remote messages from other components
+            Owned<ILogMsgFilter> filter = getCategoryLogMsgFilter(msgAudiences, msgClasses, logDetail, local);
             theManager->changeMonitorFilter(theStderrHandler, filter);
         }