Skip to content

Commit

Permalink
bugfix: catch error - "e is not defined"
Browse files Browse the repository at this point in the history
  • Loading branch information
ssahai committed Oct 25, 2023
1 parent 37141e8 commit dc4bb29
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions api/src/job.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class Job {
'--nofile=' + this.runtime.max_open_files,
'--fsize=' + this.runtime.max_file_size,
];

const timeout_call = [
'timeout',
'-s',
Expand All @@ -158,7 +158,7 @@ class Job {
prlimit.push('--as=' + memory_limit);
}

const proc_call = [
const proc_call = [
'nice',
...timeout_call,
...prlimit,
Expand Down Expand Up @@ -254,7 +254,7 @@ class Job {
if (this.state !== job_states.PRIMED) {
throw new Error(
'Job must be in primed state, current state: ' +
this.state.toString()
this.state.toString()
);
}

Expand All @@ -271,22 +271,22 @@ class Job {
const { emit_event_bus_result, emit_event_bus_stage } =
event_bus === null
? {
emit_event_bus_result: () => {},
emit_event_bus_stage: () => {},
}
emit_event_bus_result: () => { },
emit_event_bus_stage: () => { },
}
: {
emit_event_bus_result: (stage, result, event_bus) => {
const { error, code, signal } = result;
event_bus.emit('exit', stage, {
error,
code,
signal,
});
},
emit_event_bus_stage: (stage, event_bus) => {
event_bus.emit('stage', stage);
},
};
emit_event_bus_result: (stage, result, event_bus) => {
const { error, code, signal } = result;
event_bus.emit('exit', stage, {
error,
code,
signal,
});
},
emit_event_bus_stage: (stage, event_bus) => {
event_bus.emit('stage', stage);
},
};

if (this.runtime.compiled) {
this.logger.debug('Compiling');
Expand Down Expand Up @@ -352,17 +352,17 @@ class Job {
const [_, ruid, euid, suid, fuid] = uid_line.split(/\s+/);

const [_1, state, user_friendly] = state_line.split(/\s+/);

const proc_id_int = parse_int(proc_id);

// Skip over any processes that aren't ours.
if (ruid != this.uid && euid != this.uid) return -1;

if (state == 'Z') {
// Zombie process, just needs to be waited, regardless of the user id
if (!to_wait.includes(proc_id_int))
to_wait.push(proc_id_int);

return -1;
}
// We should kill in all other state (Sleep, Stopped & Running)
Expand Down Expand Up @@ -397,7 +397,7 @@ class Job {
// Then clear them out of the process tree
try {
process.kill(proc, 'SIGKILL');
} catch {
} catch (e) {
// Could already be dead and just needs to be waited on
this.logger.debug(
`Got error while SIGKILLing process ${proc}:`,
Expand Down

0 comments on commit dc4bb29

Please sign in to comment.