Pārlūkot izejas kodu

HPCC-24409 call loadConfiguration in Dali in bare metal too

NB: this makes Dali consistent with components.

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
Jake Smith 5 gadi atpakaļ
vecāks
revīzija
a6429ffc76
1 mainītis faili ar 2 papildinājumiem un 9 dzēšanām
  1. 2 9
      dali/server/daserver.cpp

+ 2 - 9
dali/server/daserver.cpp

@@ -377,9 +377,8 @@ int main(int argc, const char* argv[])
 #endif
         setAllocHook(true);
 
-#ifdef _CONTAINERIZED
-        serverConfig.setown(loadConfiguration(defaultYaml, argv, "dali", "DALI", "daliconf.xml", nullptr));
-#else
+        serverConfig.setown(loadConfiguration(defaultYaml, argv, "dali", "DALI", DALICONF, nullptr));
+#ifndef _CONTAINERIZED
         Owned<IFile> sentinelFile = createSentinelTarget();
         removeSentinelFile(sentinelFile);
 	
@@ -401,13 +400,7 @@ int main(int argc, const char* argv[])
                 return EXIT_FAILURE;
             }
         }
-
-        OwnedIFile confIFile = createIFile(DALICONF);
-        if (confIFile->exists())
-            serverConfig.setown(createPTreeFromXMLFile(DALICONF));
 #endif
-        if (!serverConfig)
-            serverConfig.setown(createPTree());
 
 #ifndef _CONTAINERIZED
         ILogMsgHandler * fileMsgHandler;