From 211fdf5389c33c49f5325ba4c5160dc9ca8565b0 Mon Sep 17 00:00:00 2001
From: michaeloffner <michaeloffner@users.noreply.github.com>
Date: Fri, 22 Nov 2024 17:42:43 +0100
Subject: [PATCH] partly revert log changes and load function and tag settings
 on demand

---
 .../java/lucee/commons/io/log/LogUtil.java    | 19 ++---
 .../runtime/config/ConfigFactoryImpl.java     | 70 +++++++++++--------
 .../java/lucee/runtime/config/ConfigImpl.java | 45 +++++++++++-
 .../main/java/lucee/runtime/tag/Admin.java    |  1 +
 .../main/java/lucee/runtime/tag/TagUtil.java  |  4 +-
 loader/build.xml                              |  2 +-
 loader/pom.xml                                |  2 +-
 7 files changed, 96 insertions(+), 47 deletions(-)

diff --git a/core/src/main/java/lucee/commons/io/log/LogUtil.java b/core/src/main/java/lucee/commons/io/log/LogUtil.java
index 834d3bbb75..ddd892f1b9 100644
--- a/core/src/main/java/lucee/commons/io/log/LogUtil.java
+++ b/core/src/main/java/lucee/commons/io/log/LogUtil.java
@@ -18,6 +18,7 @@
  **/
 package lucee.commons.io.log;
 
+import java.io.File;
 import java.util.Date;
 
 import lucee.aprint;
@@ -29,12 +30,11 @@
 import lucee.commons.lang.ExceptionUtil;
 import lucee.commons.lang.StringUtil;
 import lucee.commons.lang.SystemOut;
+import lucee.loader.engine.CFMLEngineFactory;
 import lucee.runtime.PageContext;
 import lucee.runtime.PageContextImpl;
 import lucee.runtime.PageSource;
 import lucee.runtime.config.Config;
-import lucee.runtime.config.ConfigPro;
-import lucee.runtime.config.ConfigServerImpl;
 import lucee.runtime.config.ConfigUtil;
 import lucee.runtime.config.ConfigWeb;
 import lucee.runtime.engine.ThreadLocalPageContext;
@@ -208,11 +208,6 @@ public static void log(Config config, int level, String logName, String type, St
 
 	}
 
-	public static void log(ConfigPro cw, Log log, String type, Exception e) {
-		if (log != null) log.error(type, e);
-		else log(cw, type, e);
-	}
-
 	public static void log(PageContext pc, int level, String logName, String type, String msg) {
 		Log log = ThreadLocalPageContext.getLog(pc, logName);
 		if (log != null) log.log(level, type, msg);
@@ -222,15 +217,15 @@ public static void log(PageContext pc, int level, String logName, String type, S
 	}
 
 	public static void logGlobal(Config config, int level, String type, String msg) {
-		ConfigServerImpl cs = ConfigUtil.getConfigServerImpl(config);
 		try {
+			CFMLEngineFactory factory = ConfigUtil.getCFMLEngineFactory(config);
 			Resource log;
 			boolean check = false;
 			if (level > Log.LEVEL_DEBUG) {
 				if (ERR == null) {
-					synchronized (cs) {
+					synchronized (factory) {
 						if (ERR == null) {
-							ERR = cs.getConfigDir().getRealResource("logs/err.log");
+							ERR = ResourceUtil.toResource(new File(factory.getResourceRoot(), "context/logs/err.log"));
 							check = true;
 						}
 					}
@@ -239,9 +234,9 @@ public static void logGlobal(Config config, int level, String type, String msg)
 			}
 			else {
 				if (OUT == null) {
-					synchronized (cs) {
+					synchronized (factory) {
 						if (OUT == null) {
-							OUT = cs.getConfigDir().getRealResource("logs/out.log");
+							OUT = ResourceUtil.toResource(new File(factory.getResourceRoot(), "context/logs/out.log"));
 							check = true;
 						}
 					}
diff --git a/core/src/main/java/lucee/runtime/config/ConfigFactoryImpl.java b/core/src/main/java/lucee/runtime/config/ConfigFactoryImpl.java
index 996e05de79..6d8d2c300d 100644
--- a/core/src/main/java/lucee/runtime/config/ConfigFactoryImpl.java
+++ b/core/src/main/java/lucee/runtime/config/ConfigFactoryImpl.java
@@ -279,10 +279,9 @@ public static ConfigServerImpl newInstanceServer(CFMLEngineImpl engine, Map<Stri
 			boolean hasConfigNew = configFileNew.exists() && configFileNew.length() > 0;
 
 			if (!hasConfigNew) {
-				LogUtil.logGlobal(ThreadLocalPageContext.getConfig(), Log.LEVEL_INFO, ConfigFactoryImpl.class.getName(),
-						"has no json server context config [" + configFileNew + "]");
+				LogUtil.logGlobal(null, Log.LEVEL_INFO, ConfigFactoryImpl.class.getName(), "has no json server context config [" + configFileNew + "]");
 				hasConfigOld = configFileOld.exists() && configFileOld.length() > 0;
-				LogUtil.logGlobal(ThreadLocalPageContext.getConfig(), Log.LEVEL_INFO, ConfigFactoryImpl.class.getName(),
+				LogUtil.logGlobal(null, Log.LEVEL_INFO, ConfigFactoryImpl.class.getName(),
 						"has " + (hasConfigOld ? "" : "no ") + "xml server context config [" + configFileOld + "]");
 			}
 			ConfigServerImpl config = existing != null ? existing : new ConfigServerImpl(engine, initContextes, contextes, configDir, configFileNew, ui, essentialOnly, doNew);
@@ -290,7 +289,7 @@ public static ConfigServerImpl newInstanceServer(CFMLEngineImpl engine, Map<Stri
 			// translate to new
 			if (!hasConfigNew) {
 				if (hasConfigOld) {
-					LogUtil.logGlobal(ThreadLocalPageContext.getConfig(), Log.LEVEL_INFO, ConfigFactoryImpl.class.getName(), "convert server context xml config to json");
+					LogUtil.logGlobal(null, Log.LEVEL_INFO, ConfigFactoryImpl.class.getName(), "convert server context xml config to json");
 					try {
 						translateConfigFile(config, configFileOld, configFileNew, "multi", true);
 					}
@@ -414,8 +413,6 @@ synchronized static void load(ConfigServerImpl config, Struct root, boolean isRe
 
 		config.setLastModified();
 
-		_loadFilesystem(config, root, doNew); // load this before execute any code, what for example loadxtension does (json)
-
 		if (LOG) log(config, "loaded filesystem");
 
 		if (!essentialOnly) {
@@ -430,7 +427,6 @@ synchronized static void load(ConfigServerImpl config, Struct root, boolean isRe
 		if (!essentialOnly) {
 			((CFMLEngineImpl) config.getEngine()).touchMonitor(config);
 		}
-		log(config, COMPONENT_EXTENSION);
 		config.setLoadTime(System.currentTimeMillis());
 	}
 
@@ -2131,27 +2127,18 @@ private static Object toKey(Mapping m) {
 	 * @throws TagLibException
 	 * @throws FunctionLibException
 	 */
-	private static void _loadFilesystem(ConfigServerImpl config, Struct root, boolean doNew) {
+	public static void loadTag(ConfigImpl config, Struct root, boolean doNew) {
 		try {
 			Resource configDir = config.getConfigDir();
-
-			String strDefaultFLDDirectory = null;
 			String strDefaultTLDDirectory = null;
-			String strDefaultFuncDirectory = null;
 			String strDefaultTagDirectory = null;
-			String strFuncDirectory = null;
 			String strTagDirectory = null;
 
 			// only read in server context
-			strDefaultFLDDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.fld", null);
 			strDefaultTLDDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.tld", null);
-			strDefaultFuncDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.function", null);
 			strDefaultTagDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.tag", null);
-			if (StringUtil.isEmpty(strDefaultFLDDirectory)) strDefaultFLDDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.default.fld", null);
 			if (StringUtil.isEmpty(strDefaultTLDDirectory)) strDefaultTLDDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.default.tld", null);
-			if (StringUtil.isEmpty(strDefaultFuncDirectory)) strDefaultFuncDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.default.function", null);
 			if (StringUtil.isEmpty(strDefaultTagDirectory)) strDefaultTagDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.default.tag", null);
-			strFuncDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.additional.function", null);
 			strTagDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.additional.tag", null);
 
 			Struct fileSystem = ConfigUtil.getAsStruct("fileSystem", root);
@@ -2159,27 +2146,19 @@ private static void _loadFilesystem(ConfigServerImpl config, Struct root, boolea
 			// get library directories
 			if (fileSystem != null) {
 				if (StringUtil.isEmpty(strDefaultTLDDirectory)) strDefaultTLDDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "tldDirectory"));
-				if (StringUtil.isEmpty(strDefaultFLDDirectory)) strDefaultFLDDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "flddirectory"));
 				if (StringUtil.isEmpty(strDefaultTagDirectory)) strDefaultTagDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "tagDirectory"));
-				if (StringUtil.isEmpty(strDefaultFuncDirectory)) strDefaultFuncDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "functionDirectory"));
 				if (StringUtil.isEmpty(strDefaultTLDDirectory)) strDefaultTLDDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "tldDefaultDirectory"));
-				if (StringUtil.isEmpty(strDefaultFLDDirectory)) strDefaultFLDDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "fldDefaultDirectory"));
 				if (StringUtil.isEmpty(strDefaultTagDirectory)) strDefaultTagDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "tagDefaultDirectory"));
-				if (StringUtil.isEmpty(strDefaultFuncDirectory)) strDefaultFuncDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "functionDefaultDirectory"));
 				if (StringUtil.isEmpty(strTagDirectory)) strTagDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "tagAddionalDirectory"));
-				if (StringUtil.isEmpty(strFuncDirectory)) strFuncDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "functionAddionalDirectory"));
 			}
 
 			// set default directories if necessary
-			if (StringUtil.isEmpty(strDefaultFLDDirectory)) strDefaultFLDDirectory = "{lucee-config}/library/fld/";
 			if (StringUtil.isEmpty(strDefaultTLDDirectory)) strDefaultTLDDirectory = "{lucee-config}/library/tld/";
-			if (StringUtil.isEmpty(strDefaultFuncDirectory)) strDefaultFuncDirectory = "{lucee-config}/library/function/";
 			if (StringUtil.isEmpty(strDefaultTagDirectory)) strDefaultTagDirectory = "{lucee-config}/library/tag/";
 
 			// init TLDS
 			{
-				ConfigServerImpl cs = config;
-				config.setTLDs(ConfigUtil.duplicate(new TagLib[] { cs.coreTLDs }, false));
+				config.setTLDs(ConfigUtil.duplicate(new TagLib[] { ConfigUtil.getConfigServerImpl(config).coreTLDs }, false));
 			}
 
 			// TLD Dir
@@ -2216,13 +2195,46 @@ private static void _loadFilesystem(ConfigServerImpl config, Struct root, boolea
 				}
 			}
 			config.setTagDirectory(listTags);
+		}
+		catch (Throwable t) {
+			ExceptionUtil.rethrowIfNecessary(t);
+			log(config, t);
+		}
+	}
+
+	public static void loadFunctions(ConfigImpl config, Struct root, boolean doNew) {
+		try {
+			Resource configDir = config.getConfigDir();
 
-			// FUNCTIONS
+			String strDefaultFLDDirectory = null;
+			String strDefaultFuncDirectory = null;
+			String strFuncDirectory = null;
+
+			// only read in server context
+			strDefaultFLDDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.fld", null);
+			strDefaultFuncDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.function", null);
+			if (StringUtil.isEmpty(strDefaultFLDDirectory)) strDefaultFLDDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.default.fld", null);
+			if (StringUtil.isEmpty(strDefaultFuncDirectory)) strDefaultFuncDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.default.function", null);
+			strFuncDirectory = SystemUtil.getSystemPropOrEnvVar("lucee.library.additional.function", null);
+
+			Struct fileSystem = ConfigUtil.getAsStruct("fileSystem", root);
+
+			// get library directories
+			if (fileSystem != null) {
+				if (StringUtil.isEmpty(strDefaultFLDDirectory)) strDefaultFLDDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "flddirectory"));
+				if (StringUtil.isEmpty(strDefaultFuncDirectory)) strDefaultFuncDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "functionDirectory"));
+				if (StringUtil.isEmpty(strDefaultFLDDirectory)) strDefaultFLDDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "fldDefaultDirectory"));
+				if (StringUtil.isEmpty(strDefaultFuncDirectory)) strDefaultFuncDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "functionDefaultDirectory"));
+				if (StringUtil.isEmpty(strFuncDirectory)) strFuncDirectory = ConfigUtil.translateOldPath(getAttr(fileSystem, "functionAddionalDirectory"));
+			}
+
+			// set default directories if necessary
+			if (StringUtil.isEmpty(strDefaultFLDDirectory)) strDefaultFLDDirectory = "{lucee-config}/library/fld/";
+			if (StringUtil.isEmpty(strDefaultFuncDirectory)) strDefaultFuncDirectory = "{lucee-config}/library/function/";
 
 			// Init flds
 			{
-				ConfigServerImpl cs = config;
-				config.setFLDs(cs.coreFLDs.duplicate(false));
+				config.setFLDs(ConfigUtil.getConfigServerImpl(config).coreFLDs.duplicate(false));
 
 			}
 
diff --git a/core/src/main/java/lucee/runtime/config/ConfigImpl.java b/core/src/main/java/lucee/runtime/config/ConfigImpl.java
index ae264d2913..a6c811529d 100755
--- a/core/src/main/java/lucee/runtime/config/ConfigImpl.java
+++ b/core/src/main/java/lucee/runtime/config/ConfigImpl.java
@@ -583,9 +583,28 @@ public ConfigImpl resetScopeCascadingType() {
 	 */
 	@Override
 	public TagLib[] getTLDs() {
+		if (cfmlTlds == null) {
+			synchronized (SystemUtil.createToken("ConfigImpl", "getTLDs")) {
+				if (cfmlTlds == null) {
+					ConfigFactoryImpl.loadTag(this, root, newVersion());
+				}
+			}
+		}
 		return cfmlTlds;
 	}
 
+	public ConfigImpl resetTLDs() {
+		if (cfmlTlds != null) {
+			synchronized (SystemUtil.createToken("ConfigImpl", "getTLDs")) {
+				if (cfmlTlds != null) {
+					cfmlTlds = null;
+					tldFile = null;
+				}
+			}
+		}
+		return this;
+	}
+
 	@Override
 	public TagLib getCoreTagLib() {
 		TagLib[] tlds = getTLDs();
@@ -1688,7 +1707,7 @@ public void setPassword(Password password) {
 		this.password = password;
 	}
 
-	protected void addTag(String nameSpace, String nameSpaceSeperator, String name, ClassDefinition cd) {
+	protected void addTagXXX(String nameSpace, String nameSpaceSeperator, String name, ClassDefinition cd) {
 
 		TagLib[] tlds = cfmlTlds;
 		for (int i = 0; i < tlds.length; i++) {
@@ -1944,13 +1963,32 @@ protected void setFLDs(FunctionLib flds) {
 	 */
 	@Override
 	public FunctionLib getFLDs() {
+		if (cfmlFlds == null) {
+			synchronized (SystemUtil.createToken("ConfigImpl", "getFLDs")) {
+				if (cfmlFlds == null) {
+					ConfigFactoryImpl.loadFunctions(this, root, newVersion());
+				}
+			}
+		}
 		return cfmlFlds;
 	}
 
+	public ConfigImpl resetFLDs() {
+		if (cfmlFlds != null) {
+			synchronized (SystemUtil.createToken("ConfigImpl", "getFLDs")) {
+				if (cfmlFlds != null) {
+					cfmlFlds = null;
+					fldFile = null;
+				}
+			}
+		}
+		return this;
+	}
+
 	@Override
 	@Deprecated
 	public FunctionLib[] getFLDs(int dialect) { // used in the image extension
-		return new FunctionLib[] { cfmlFlds };
+		return new FunctionLib[] { getFLDs() };
 	}
 
 	protected void setFldFile(Resource fileFld) throws FunctionLibException {
@@ -1982,6 +2020,8 @@ protected void setFldFile(Resource fileFld) throws FunctionLibException {
 
 	@Override
 	public Resource getFldFile() {
+		getFLDs(); // will trigger the load of this variable
+
 		return fldFile;
 	}
 
@@ -2770,6 +2810,7 @@ public ConfigImpl resetResourceCharSet() {// = SystemUtil.getCharSet()
 
 	@Override
 	public Resource getTldFile() {
+		getTLDs();
 		return tldFile;
 	}
 
diff --git a/core/src/main/java/lucee/runtime/tag/Admin.java b/core/src/main/java/lucee/runtime/tag/Admin.java
index 783ab8ae67..1f7b75d5e4 100755
--- a/core/src/main/java/lucee/runtime/tag/Admin.java
+++ b/core/src/main/java/lucee/runtime/tag/Admin.java
@@ -4711,6 +4711,7 @@ private void doUpdateFilesystem() throws PageException {
 			throw Caster.toPageException(e);
 		}
 		store();
+		ConfigUtil.getConfigServerImpl(config).resetTLDs().resetFLDs();
 		((ConfigWebPro) pageContext.getConfig()).resetServerFunctionMappings();
 	}
 
diff --git a/core/src/main/java/lucee/runtime/tag/TagUtil.java b/core/src/main/java/lucee/runtime/tag/TagUtil.java
index 469353cd99..6d8c0a1df7 100755
--- a/core/src/main/java/lucee/runtime/tag/TagUtil.java
+++ b/core/src/main/java/lucee/runtime/tag/TagUtil.java
@@ -239,7 +239,7 @@ else if (value instanceof Map) {
 	 * @param cs
 	 * @param config
 	 */
-	public static void addTagMetaData(ConfigWebPro cw, lucee.commons.io.log.Log log) {
+	public static void addTagMetaData(ConfigWebPro cw) {
 
 		PageContextImpl pc = null;
 		try {
@@ -260,7 +260,7 @@ public static void addTagMetaData(ConfigWebPro cw, lucee.commons.io.log.Log log)
 
 		}
 		catch (Exception e) {
-			LogUtil.log(cw, log, "tag", e);
+			LogUtil.log(cw, "tag", e);
 		}
 		finally {
 			pc.getConfig().getFactory().releaseLuceePageContext(pc, true);
diff --git a/loader/build.xml b/loader/build.xml
index 4dc5f57348..8a80871743 100644
--- a/loader/build.xml
+++ b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="7.0.0.60-SNAPSHOT"/>
+  <property name="version" value="7.0.0.61-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>
diff --git a/loader/pom.xml b/loader/pom.xml
index b7acc2e15c..e1e65ac1cc 100644
--- a/loader/pom.xml
+++ b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>7.0.0.60-SNAPSHOT</version>
+  <version>7.0.0.61-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>