@@ -619,33 +619,28 @@ class LightningRepo @Inject constructor(
619619 }
620620
621621 suspend fun restartWithRgsServer (newRgsUrl : String ): Result <Unit > = withContext(bgDispatcher) {
622- runCatching {
623- Logger .info(" Changing ldk-node RGS server to: '$newRgsUrl '" , context = TAG )
622+ Logger .info(" Changing ldk-node RGS server to: '$newRgsUrl '" , context = TAG )
624623
625- validateRgsUrl(newRgsUrl).onFailure { return @runCatching Result .failure(it) }
624+ validateRgsUrl(newRgsUrl).onFailure { return @withContext Result .failure(it) }
626625
627- waitForNodeToStop().onFailure { return @runCatching Result .failure(it) }
628- stop().onFailure {
629- Logger .error(" Failed to stop node during RGS server change" , it, context = TAG )
630- return @runCatching Result .failure(it)
631- }
626+ waitForNodeToStop().onFailure { return @withContext Result .failure(it) }
627+ stop().onFailure {
628+ Logger .error(" Failed to stop node during RGS server change" , it, context = TAG )
629+ return @withContext Result .failure(it)
630+ }
632631
633- Logger .debug(" Starting node with new RGS server: '$newRgsUrl '" , context = TAG )
632+ Logger .debug(" Starting node with new RGS server: '$newRgsUrl '" , context = TAG )
634633
635- start(
636- shouldRetry = false ,
637- customRgsServerUrl = newRgsUrl,
638- ).onFailure {
639- Logger .warn(" Failed ldk-node config change, attempting recovery…" , context = TAG )
640- restartWithPreviousConfig()
641- }.onSuccess {
642- settingsStore.update { it.copy(rgsServerUrl = newRgsUrl) }
643-
644- Logger .info(" Successfully changed RGS server" , context = TAG )
645- }
646- }.getOrElse {
647- Logger .error(" Unexpected error during RGS server change" , it, context = TAG )
648- Result .failure(it)
634+ start(
635+ shouldRetry = false ,
636+ customRgsServerUrl = newRgsUrl,
637+ ).onFailure {
638+ Logger .warn(" Failed ldk-node config change, attempting recovery…" , context = TAG )
639+ restartWithPreviousConfig()
640+ }.onSuccess {
641+ settingsStore.update { it.copy(rgsServerUrl = newRgsUrl) }
642+
643+ Logger .info(" Successfully changed RGS server" , context = TAG )
649644 }
650645 }
651646
0 commit comments