Skip to content

More retry #236

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
code-asher merged 8 commits into from
May 2, 2023
Merged

More retry #236

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4bacfc4
Add log when deploying before listing editors
code-asher Apr 27, 2023
73f9b19
Fix timer not canceling
code-asher Apr 28, 2023
405fb43
Retry direct connection
code-asher Apr 28, 2023
4e5206e
Provide better error when dd times out
code-asher Apr 28, 2023
88c3297
Throwable does not need to be nullable
code-asher May 1, 2023
f417542
Break out humanizeDuration
code-asher May 1, 2023
1a67157
Munge error at point of display
code-asher May 1, 2023
d1d3e91
Refactor retry
code-asher May 1, 2023
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
Prev Previous commit
Next Next commit
Throwable does not need to be nullable 
If there is no cause we use the existing exception so this will never be
null.
  • Loading branch information
@code-asher
code-asher committed May 1, 2023
commit 88c329719de8b0e2df541da89df5928081d53587
4 changes: 2 additions & 2 deletions src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
},
update = { _, e, remaining, ->
if (remaining != null) {
indicator.text2 = e?.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
indicator.text2 = e.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
indicator.text = CoderGatewayBundle.message("gateway.connector.coder.connection.retry-error.text", remaining)
} else {
ApplicationManager.getApplication().invokeAndWait {
Messages.showMessageDialog(
e?.message ?: CoderGatewayBundle.message("gateway.connector.no-details"),
e.message ?: CoderGatewayBundle.message("gateway.connector.no-details"),
CoderGatewayBundle.message("gateway.connector.coder.connection.error.text"),
Messages.getErrorIcon())
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/com/coder/gateway/sdk/Retry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import java.util.concurrent.TimeUnit
import kotlin.coroutines.cancellation.CancellationException
import kotlin.math.min

fun unwrap(ex: Exception): Throwable? {
fun unwrap(ex: Exception): Throwable {
var cause = ex.cause
while(cause?.cause != null) {
cause = cause.cause
Expand All @@ -37,8 +37,8 @@ suspend fun <T> suspendingRetryWithExponentialBackOff(
backOffJitter: Double = 0.1,
label: String,
logger: Logger,
predicate: (e: Throwable?) -> Boolean,
update: (attempt: Int, e: Throwable?, remaining: String?) -> Unit,
predicate: (e: Throwable) -> Boolean,
update: (attempt: Int, e: Throwable, remaining: String?) -> Unit,
action: suspend (attempt: Int) -> T?
): T? {
val random = Random()
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class CoderLocateRemoteProjectStepView(private val setNextButtonEnabled: (Boolea
},
update = { _, e, remaining ->
cbIDEComment.foreground = UIUtil.getErrorForeground()
cbIDEComment.text = e?.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
cbIDEComment.text = e.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
cbIDE.renderer =
if (remaining != null) IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.retry-error.text", remaining))
else IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.error.text"), UIUtil.getBalloonErrorIcon())
Expand Down