improve cfconfig test

lucee · Jun 27, 2024 · 369982a · 369982a
1 parent 5f7fc5c
commit 369982a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/custom/default-cfconfig/.CFConfig-empty.json b/custom/default-cfconfig/.CFConfig-empty.json
@@ -1 +1,3 @@
-{}
+{
+    "mode":"single"
+}
diff --git a/custom/default-cfconfig/compareDefault.cfm b/custom/default-cfconfig/compareDefault.cfm
@@ -1,9 +1,28 @@
 <cfscript>
     default = deserializeJSON( fileRead( expandPath( "./.CFConfig-default.json" ) ) );
     contextFiles = directoryList( path=Expandpath( "{lucee-config}" ), recurse=true );
-    for ( cf in contextFiles )
-        systemOutput( cf, true );
-    empty = deserializeJSON( fileRead( expandPath( '{lucee-config}.CFConfig.json' ) ) );
+    cfgPAth = expandPath( '{lucee-config}.CFConfig.json' );
+    if ( !fileExists( cfgPath ) ){
+        for ( cf in contextFiles ) {
+            systemOutput( cf, true );
+        }
+        log = expandPath( '{lucee-config}/logs/out.log' );
+        if ( !fileExists( log ) ){
+            systemOutput( "" ):
+            systemOutput( "--------- out.log-----------" ):            
+            systemOutput( fileRead( log ) ):
+        }
+        errlog = expandPath( '{lucee-config}/logs/err.log' );
+        if ( !fileExists( errlog ) ){
+            systemOutput( "" ):
+            systemOutput( "--------- err.log-----------" ):
+            systemOutput( fileRead( errlog ) ):
+        }
+        
+        throw "missing .CFConfig.json [#cfgPath#]";
+    }
+    
+    empty = deserializeJSON( fileRead( cfgPath ) );
 
     ignore = [ "salt", "hspw" ];
     problems = 0;