Skip to content

Commit 702cf87

Browse files
committed
Merge branch 't3/background-server-updates' into t3/desktop-background-updates
2 parents 772a756 + 0df12e8 commit 702cf87

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎apps/server/src/provider/providerMaintenanceCommandCoordinator.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class ProviderMaintenanceAdmission extends Context.Service<
1111
{
1212
readonly withPermit: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
1313
}
14-
>()("t3/provider/ProviderMaintenanceAdmission") {}
14+
>()("t3/provider/providerMaintenanceCommandCoordinator/ProviderMaintenanceAdmission") {}
1515

1616
// Keep one layer reference so the update window and turn startup share its permit.
1717
export const admissionLayer = Layer.effect(
@@ -27,7 +27,7 @@ export interface ProviderMaintenanceCommandCoordinatorShape<E> {
2727
readonly lockKey: string;
2828
readonly onQueued?: Effect.Effect<void, E, R>;
2929
readonly onInterrupted?: Effect.Effect<void, E, R>;
30-
readonly admit?: <A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
30+
readonly admit?: ProviderMaintenanceAdmission["Service"]["withPermit"];
3131
readonly run: Effect.Effect<A, E, R>;
3232
}) => Effect.Effect<A, E, R>;
3333
}

‎apps/server/src/provider/providerMaintenanceRunner.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
390390

391391
const updateProvider = Effect.fn("ProviderMaintenanceRunner.updateProvider")(function* (
392392
target: Parameters<ProviderMaintenanceRunnerShape["updateProvider"]>[0],
393-
alreadyAdmitted = false,
393+
alreadyAdmitted: boolean = false,
394394
) {
395395
const provider = typeof target === "string" ? target : target.provider;
396396
const instanceId =

‎apps/server/src/updates/ServerAutoUpdater.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export const layer = Layer.effectDiscard(
104104
yield* selfUpdate.update({ targetVersion });
105105
// The launcher stops us after accepting the handoff. Keep new provider
106106
// starts behind the install permit until this runtime is shut down.
107-
yield* Effect.never;
107+
return yield* Effect.never;
108108
}),
109109
);
110110
}).pipe(

0 commit comments

Comments
 (0)