updates to shutdown factories correctly

ColdBox · Nov 2, 2023 · 0649b67 · 0649b67
1 parent 445f727
commit 0649b67
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 14 deletions.
diff --git a/system/cache/providers/CacheBoxProvider.cfc b/system/cache/providers/CacheBoxProvider.cfc
@@ -138,13 +138,13 @@ component
 			variables.cacheFactory
 				.getTaskScheduler()
 				.newTask(
-					name  : "cachebox-reap-#getName()#",
+					name  : "cachebox-reap-#getName()#-#getCacheId()#",
 					task  : this,
 					method: "reap"
 				)
-				.inMinutes()
 				.delay( getConfiguration().reapFrequency ) // Don't start immediately, give it a breathing room
 				.spacedDelay( getConfiguration().reapFrequency ) // Runs again, after this spaced delay once each reap finalizes
+				.inMinutes()
 				.start();
 
 			variables.logger.info(

diff --git a/tests/specs/cache/CacheBoxStandalone.cfc b/tests/specs/cache/CacheBoxStandalone.cfc
@@ -18,6 +18,10 @@ component extends="testbox.system.BaseSpec" {
 	function run( testResults, testBox ){
 		// all your suites go here.
 		describe( "CacheBox Standalone", function(){
+			afterEach( function( currentSpec ){
+				cachebox.shutdown();
+			} );
+
 			it( "can be configured with a standalone configuration object", function(){
 				cacheBox = new coldbox.system.cache.CacheFactory(
 					config = "tests.resources.StandaloneCacheBoxConfig"

diff --git a/tests/specs/cache/CacheFactoryTest.cfc b/tests/specs/cache/CacheFactoryTest.cfc
@@ -9,6 +9,10 @@
 		cacheFactory.init();
 	}
 
+	function afterTests(){
+		cacheFactory.shutdown();
+	}
+
 	function testGetConfig(){
 		// debug( cacheFactory.getConfig() );
 	}

diff --git a/tests/specs/cache/config/CacheBoxConfigWithDataCFCTest.cfc b/tests/specs/cache/config/CacheBoxConfigWithDataCFCTest.cfc
@@ -1,5 +1,5 @@
-<cfcomponent extends="coldbox.system.testing.BaseModelTest">
-	<cfscript>
+component extends="coldbox.system.testing.BaseModelTest" {
+
 	function setup(){
 		// cacheBox = createMock(className="coldbox.system.logging.LogBox" );
 		dataConfigPath = "coldbox.tests.resources.CacheBoxConfigData";
@@ -51,5 +51,5 @@
 
 		config.validate();
 	}
-	</cfscript>
-</cfcomponent>
+
+}
diff --git a/tests/specs/cache/config/DefaultConfigurationTest.cfc b/tests/specs/cache/config/DefaultConfigurationTest.cfc
@@ -1,11 +1,11 @@
-<cfcomponent extends="coldbox.system.testing.BaseModelTest">
-	<cfscript>
+component extends="coldbox.system.testing.BaseModelTest" {
+
 	function setup(){
 		config = createMock( "coldbox.system.cache.config.DefaultConfiguration" );
 	}
 
 	function testConfigure(){
 		config.configure();
 	}
-	</cfscript>
-</cfcomponent>
+
+}
diff --git a/tests/specs/cache/listeners/CacheFactoryListenersTest.cfc b/tests/specs/cache/listeners/CacheFactoryListenersTest.cfc
@@ -1,5 +1,5 @@
-<cfcomponent extends="coldbox.system.testing.BaseModelTest">
-	<cfscript>
+component extends="coldbox.system.testing.BaseModelTest" {
+
 	function setup(){
 		// init with defaults
 		cacheFactory = createMock( "coldbox.system.cache.CacheFactory" );
@@ -13,12 +13,16 @@
 		cacheFactory.init( config = config );
 	}
 
+	function afterTests(){
+		cacheFactory.shutdown();
+	}
+
 	function testRegisterListeners(){
 		eventContainers = cacheFactory.getEventManager().getEventPoolContainer();
 
 		assertEquals( true, structKeyExists( eventContainers, "afterCacheElementInsert" ) );
 		assertEquals( true, structKeyExists( eventContainers, "beforeCacheShutdown" ) );
 		assertEquals( true, structKeyExists( eventContainers, "afterCacheFactoryConfiguration" ) );
 	}
-	</cfscript>
-</cfcomponent>
+
+}
diff --git a/tests/specs/logging/appenders/FileAppenderTest.cfc b/tests/specs/logging/appenders/FileAppenderTest.cfc
@@ -55,6 +55,7 @@ component extends="coldbox.system.testing.BaseModelTest" {
 				}
 
 				// sleep to let threads write to disk.
+				writeDump( var = "Sleeping for 5 seconds waiting for log file...", output = "console" );
 				sleep( 5000 );
 
 				var content = fileRead( fileAppender.getLogFullPath() );