Skip to content

Allow re-scheduleSnapshotAutoUpdate #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petruki merged 5 commits into from
Aug 16, 2025
Merged

Allow re-scheduleSnapshotAutoUpdate #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec6ef6f
Allow re-scheduleSnapshotAutoUpdate
petruki Aug 16, 2025
62b295c
debug: dangling thread after termination
petruki Aug 16, 2025
7fad081
test: improved tearDown logic for watcher schedulers
petruki Aug 16, 2025
09d91a2
debug: dangling thread after termination
petruki Aug 16, 2025
ff6bdec
revert: ubuntu 24.04 failing to terminate schedulers during test
petruki Aug 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
required: true
default: '17'
os:
description: 'Operating System (ubuntu-22.04, ubuntu-latest, windows-latest)'
description: 'Operating System (ubuntu-latest, windows-latest)'
required: true
default: 'ubuntu-latest'

Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/switcherapi/client/SwitcherContextBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,14 @@ private static void scheduleSnapshotWatcher() {
* @return ScheduledFuture instance
*/
public static ScheduledFuture<?> scheduleSnapshotAutoUpdate(String intervalValue, SnapshotCallback callback) {
if (StringUtils.isBlank(intervalValue) || scheduledExecutorService != null) {
if (StringUtils.isBlank(intervalValue)) {
return null;
}

if (Objects.nonNull(scheduledExecutorService)) {
terminateSnapshotAutoUpdateWorker();
}

final long interval = SwitcherUtils.getMillis(intervalValue);
final SnapshotCallback callbackFinal = Optional.ofNullable(callback).orElse(new SnapshotCallback() {});
final Runnable runnableSnapshotValidate = () -> {
Expand Down
11 changes: 8 additions & 3 deletions src/test/java/com/switcherapi/client/SwitcherSnapshotAutoUpdateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,15 @@ void shouldNotKillThread_whenAPI_wentLocal() {

@Test
@Order(6)
void shouldPreventSnapshotAutoUpdateToStart_whenAlreadySetup() {
//given
void shouldRestartSnapshotAutoUpdate_whenAlreadySetup() {
//given - initialize (snapshot autoload)
givenResponse(generateMockAuth(10)); //auth
givenResponse(generateSnapshotResponse("default.json", SNAPSHOTS_LOCAL)); //graphql

//given - snapshot auto update
givenResponse(generateCheckSnapshotVersionResponse(Boolean.toString(false))); //criteria/snapshot_check
givenResponse(generateSnapshotResponse("default.json", SNAPSHOTS_LOCAL)); //graphql

//that
Switchers.configure(ContextBuilder.builder(true)
.context(Switchers.class.getCanonicalName())
Expand All @@ -235,8 +239,9 @@ void shouldPreventSnapshotAutoUpdateToStart_whenAlreadySetup() {
.snapshotAutoUpdateInterval("1s"));

Switchers.initializeClient();

ScheduledFuture<?> snapshotUpdater = Switchers.scheduleSnapshotAutoUpdate("1m");
assertNull(snapshotUpdater);
assertNotNull(snapshotUpdater);
}

}
Loading