Skip to content

Commit c7ebc57

Browse files
fixes issue with logging memory leak (#726)
Co-authored-by: rishabhpoddar <[email protected]>
1 parent 94b00f5 commit c7ebc57

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/main/java/io/supertokens/output/Logging.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import io.supertokens.Main;
2525
import io.supertokens.ResourceDistributor;
2626
import io.supertokens.config.Config;
27-
import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
2827
import io.supertokens.pluginInterface.LOG_LEVEL;
2928
import io.supertokens.pluginInterface.Storage;
3029
import io.supertokens.pluginInterface.multitenancy.TenantIdentifier;
30+
import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
3131
import io.supertokens.storageLayer.StorageLayer;
3232
import io.supertokens.utils.Utils;
3333
import io.supertokens.webserver.Webserver;
@@ -174,7 +174,8 @@ public static void error(Main main, TenantIdentifier tenantIdentifier, String er
174174
}
175175
}
176176

177-
public static void error(Main main, TenantIdentifier tenantIdentifier, String message, boolean toConsoleAsWell, Exception e) {
177+
public static void error(Main main, TenantIdentifier tenantIdentifier, String message, boolean toConsoleAsWell,
178+
Exception e) {
178179
try {
179180
if (!Config.getConfig(new TenantIdentifier(null, null, null), main).getLogLevels(main)
180181
.contains(LOG_LEVEL.ERROR)) {
@@ -220,6 +221,10 @@ public static void stopLogging(Main main) {
220221
if (getInstance(main) == null) {
221222
return;
222223
}
224+
getInstance(main).infoLogger.getLoggerContext().stop();
225+
getInstance(main).errorLogger.getLoggerContext().stop();
226+
getInstance(main).infoLogger.getLoggerContext().getStatusManager().clear();
227+
getInstance(main).errorLogger.getLoggerContext().getStatusManager().clear();
223228
getInstance(main).infoLogger.detachAndStopAllAppenders();
224229
getInstance(main).errorLogger.detachAndStopAllAppenders();
225230
Webserver.getInstance(main).closeLogger();

src/test/java/io/supertokens/test/multitenant/LoadTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void beforeEach() {
5656
}
5757

5858
@Test
59-
public void testCreating100StorageLayersUsage()
59+
public void testCreating100TenantsAndCheckOnlyOneInstanceOfStorageLayerIsCreated()
6060
throws InterruptedException {
6161
String[] args = {"../"};
6262

0 commit comments

Comments
 (0)