fix(striker-ui-api): distinguish processes in messages

main
Tsu-ba-me 1 year ago
parent e4ae03a7f8
commit e670e0f94c
  1. 6
      striker-ui-api/src/index.ts
  2. 24
      striker-ui-api/src/lib/accessModule.ts

@ -7,7 +7,7 @@ import { proxyServerVncUpgrade } from './middlewares';
import { stderr, stdout } from './lib/shell'; import { stderr, stdout } from './lib/shell';
(async () => { (async () => {
stdout(`Starting process with ownership ${getuid()}:${getgid()}`); stdout(`Starting main process with ownership ${getuid()}:${getgid()}`);
const server = (await app).listen(PORT, () => { const server = (await app).listen(PORT, () => {
try { try {
@ -15,9 +15,9 @@ import { stderr, stdout } from './lib/shell';
setgid(PGID); setgid(PGID);
setuid(PUID); setuid(PUID);
stdout(`Process ownership changed to ${getuid()}:${getgid()}.`); stdout(`Main process ownership changed to ${getuid()}:${getgid()}.`);
} catch (error) { } catch (error) {
stderr(`Failed to change process ownership; CAUSE: ${error}`); stderr(`Failed to change main process ownership; CAUSE: ${error}`);
process.exit(ECODE_DROP_PRIVILEGES); process.exit(ECODE_DROP_PRIVILEGES);
} }

@ -36,10 +36,9 @@ class Access extends EventEmitter {
uid = PUID, uid = PUID,
...restSpawnOptions ...restSpawnOptions
}: AccessStartOptions = {}) { }: AccessStartOptions = {}) {
shvar( const options = { args, gid, stdio, timeout, uid, ...restSpawnOptions };
{ gid, stdio, timeout, uid, ...restSpawnOptions },
`Starting anvil-access-module daemon with options: `, shvar(options, `Starting anvil-access-module daemon with: `);
);
const ps = spawn(SERVER_PATHS.usr.sbin['anvil-access-module'].self, args, { const ps = spawn(SERVER_PATHS.usr.sbin['anvil-access-module'].self, args, {
gid, gid,
@ -49,13 +48,24 @@ class Access extends EventEmitter {
...restSpawnOptions, ...restSpawnOptions,
}); });
ps.on('spawn', () => {
shvar(
options,
`Successfully started anvil-access-module daemon (pid=${ps.pid}): `,
);
});
ps.on('error', (error) => { ps.on('error', (error) => {
sherr(`anvil-access-module daemon error: ${error.message}`, error); sherr(
`anvil-access-module daemon (pid=${ps.pid}) error: ${error.message}`,
error,
);
}); });
ps.on('close', (code, signal) => { ps.on('close', (code, signal) => {
shout( shvar(
`anvil-access-module daemon exited; code=${code}, signal=${signal}`, { code, options, signal },
`anvil-access-module daemon (pid=${ps.pid}) closed: `,
); );
}); });

Loading…
Cancel
Save