HPCC-26013 Avoid a couple of spurious env. calls in container mode

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
hpcc-systems · Jun 11, 2021 · c07b29d · c07b29d
1 parent df3a291
commit c07b29d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ecl/eclagent/eclagent.cpp b/ecl/eclagent/eclagent.cpp
@@ -3659,13 +3659,13 @@ extern int HTHOR_API eclagent_main(int argc, const char *argv[], StringBuffer *
             startLogMsgParentReceiver();
             connectLogMsgManagerToDali();
 
+#ifndef _CONTAINERIZED
             StringBuffer baseDir;
             if (getConfigurationDirectory(agentTopology->queryPropTree("Directories"),"data","eclagent",agentTopology->queryProp("@name"),baseDir.clear()))
                 setBaseDirectory(baseDir.str(), false);
             if (getConfigurationDirectory(agentTopology->queryPropTree("Directories"),"mirror","eclagent",agentTopology->queryProp("@name"),baseDir.clear()))
                 setBaseDirectory(baseDir.str(), true);
 
-#ifndef _CONTAINERIZED
             if (agentTopology->getPropBool("@useNASTranslation", true))
                 envInstallNASHooks();
 #endif

diff --git a/fs/dafsclient/rmtfile.cpp b/fs/dafsclient/rmtfile.cpp
@@ -2137,15 +2137,21 @@ IDaFileSrvHook *queryDaFileSrvHook()
 
 void enableForceRemoteReads()
 {
+#ifndef _CONTAINERIZED
     const char *forceRemotePattern = queryEnvironmentConf().queryProp("forceRemotePattern");
     if (!isEmptyString(forceRemotePattern))
         queryDaFileSrvHook()->forceRemote(forceRemotePattern);
+#endif
 }
 
 bool testForceRemote(const char *path)
 {
+#ifndef _CONTAINERIZED
     const char *forceRemotePattern = queryEnvironmentConf().queryProp("forceRemotePattern");
     return !isEmptyString(forceRemotePattern) && WildMatch(path, forceRemotePattern, false);
+#else
+    return false;
+#endif
 }