refactor(desktop): remove configureEnv callback from spawnLocalServer (#27022)
This commit is contained in:
@@ -291,25 +291,19 @@ const main = Effect.gen(function* () {
|
|||||||
if (mainWindow) sendSqliteMigrationProgress(mainWindow, progress)
|
if (mainWindow) sendSqliteMigrationProgress(mainWindow, progress)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
ensureLoopbackNoProxy()
|
||||||
|
useEnvProxy()
|
||||||
|
|
||||||
logger.log("spawning sidecar", { url })
|
logger.log("spawning sidecar", { url })
|
||||||
const { listener, health } = yield* Effect.promise(() =>
|
const { listener, health } = yield* Effect.promise(() =>
|
||||||
spawnLocalServer(
|
spawnLocalServer(hostname, port, password, {
|
||||||
hostname,
|
needsMigration,
|
||||||
port,
|
userDataPath: app.getPath("userData"),
|
||||||
password,
|
onSqliteProgress: (progress) => initEmitter.emit("sqlite", progress),
|
||||||
() => {
|
onStdout: (message) => logger.log("sidecar stdout", { message }),
|
||||||
ensureLoopbackNoProxy()
|
onStderr: (message) => logger.warn("sidecar stderr", { message }),
|
||||||
useEnvProxy()
|
onExit: (code) => logger.warn("sidecar exited", { code }),
|
||||||
},
|
}),
|
||||||
{
|
|
||||||
needsMigration,
|
|
||||||
userDataPath: app.getPath("userData"),
|
|
||||||
onSqliteProgress: (progress) => initEmitter.emit("sqlite", progress),
|
|
||||||
onStdout: (message) => logger.log("sidecar stdout", { message }),
|
|
||||||
onStderr: (message) => logger.warn("sidecar stderr", { message }),
|
|
||||||
onExit: (code) => logger.warn("sidecar exited", { code }),
|
|
||||||
},
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
server = listener
|
server = listener
|
||||||
yield* Deferred.succeed(serverReady, {
|
yield* Deferred.succeed(serverReady, {
|
||||||
|
|||||||
@@ -70,10 +70,8 @@ export async function spawnLocalServer(
|
|||||||
hostname: string,
|
hostname: string,
|
||||||
port: number,
|
port: number,
|
||||||
password: string,
|
password: string,
|
||||||
configureEnv: () => void,
|
|
||||||
options: SpawnLocalServerOptions,
|
options: SpawnLocalServerOptions,
|
||||||
) {
|
) {
|
||||||
configureEnv?.()
|
|
||||||
const sidecar = join(dirname(fileURLToPath(import.meta.url)), "sidecar.js")
|
const sidecar = join(dirname(fileURLToPath(import.meta.url)), "sidecar.js")
|
||||||
const child = utilityProcess.fork(sidecar, [], {
|
const child = utilityProcess.fork(sidecar, [], {
|
||||||
cwd: process.cwd(),
|
cwd: process.cwd(),
|
||||||
|
|||||||
Reference in New Issue
Block a user