Skip to content

Commit cea2bac

Browse files
authored
Skip cache testing service inits in local dev by default (#757)
- 15s wait introduced by TestCacheService seems unfortunate for every local start of toolbox - disable both of these services by default, but provide instance config to allow a dev who wants to run them locally to keep them on.
1 parent eb646c8 commit cea2bac

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

grails-app/services/io/xh/toolbox/admin/TestCacheService.groovy

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import io.xh.hoist.cache.CacheEntryChanged
88
import java.time.LocalDate
99

1010
import static io.xh.hoist.util.DateTimeUtils.SECONDS
11+
import static io.xh.hoist.util.InstanceConfigUtils.getInstanceConfig
12+
import static io.xh.hoist.util.Utils.isLocalDevelopment
1113
import static java.lang.Thread.sleep
1214
import static TestUtils.*
1315

@@ -36,7 +38,12 @@ class TestCacheService extends BaseService {
3638

3739
void init() {
3840
super.init()
39-
initData()
41+
42+
if (isLocalDevelopment && !getInstanceConfig('initTestCacheServices')) {
43+
logInfo("Disabled by default in local development mode - set initTestCacheServices instance config to override")
44+
} else {
45+
initData()
46+
}
4047
}
4148

4249
private void initData() {

grails-app/services/io/xh/toolbox/admin/TestCachedValueService.groovy

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import io.xh.hoist.cachedvalue.CachedValue
66
import io.xh.hoist.cachedvalue.CachedValueChanged
77

88
import static io.xh.hoist.util.DateTimeUtils.SECONDS
9+
import static io.xh.hoist.util.InstanceConfigUtils.getInstanceConfig
10+
import static io.xh.hoist.util.Utils.getIsLocalDevelopment
911
import static io.xh.toolbox.admin.TestUtils.generatePrice
1012
import static io.xh.toolbox.admin.TestUtils.generateResultSet
1113

@@ -33,8 +35,13 @@ class TestCachedValueService extends BaseService {
3335

3436
void init() {
3537
super.init()
36-
if (isPrimary) initData()
37-
resultValue.ensureAvailable()
38+
39+
if (isLocalDevelopment && !getInstanceConfig('initTestCacheServices')) {
40+
logInfo("Disabled by default in local development mode - set initTestCacheServices instance config to override")
41+
} else {
42+
if (isPrimary) initData()
43+
resultValue.ensureAvailable()
44+
}
3845
}
3946

4047
private void initData() {

0 commit comments

Comments
 (0)