Skip to content

Commit

Permalink
Log child process creation context
Browse files Browse the repository at this point in the history
  • Loading branch information
Zubnix committed Nov 13, 2023
1 parent 9f850cc commit 4e32671
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
1 change: 0 additions & 1 deletion packages/compositor-proxy-cli/src/SessionProcess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ async function launchApp({
}

try {
logger.info(`Launching application ${name}`)
const nativeAppContext = await launchApplication(name, executable, args, env, context.session)
// start a timer to terminate the app if no connection is made
nativeAppContext.onDisconnect()
Expand Down
16 changes: 11 additions & 5 deletions packages/compositor-proxy/src/NativeAppContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,18 @@ export function launchApplication(
return new Promise<NativeAppContext>((resolve, reject) => {
const appLogger = createLogger(applicationExecutable)

const appEnv = {
...process.env,
...env,
WAYLAND_DISPLAY: session.nativeWaylandCompositorSession.waylandDisplay,
}
appLogger.info(
`Launching application ${applicationExecutable} with args ${JSON.stringify(
args,
)} and environment ${JSON.stringify(appEnv)}`,
)
const childProcess = spawn(applicationExecutable, args, {
env: {
...process.env,
...env,
WAYLAND_DISPLAY: session.nativeWaylandCompositorSession.waylandDisplay,
},
env: appEnv,
})

childProcess.stdout.on('data', (data) => {
Expand Down

0 comments on commit 4e32671

Please sign in to comment.