diff --git a/api/src/controllers/internal/Execution.ts b/api/src/controllers/internal/Execution.ts index 9196014..3004f56 100644 --- a/api/src/controllers/internal/Execution.ts +++ b/api/src/controllers/internal/Execution.ts @@ -128,8 +128,10 @@ export class ExecutionController { // INFO: webout can be a Buffer, that is why it's length should be checked to determine if it is empty if (webout && webout.length !== 0) resultParts.push(webout) + // INFO: log separator wraps the log from the beginning and the end resultParts.push(process.logsUUID) resultParts.push(log) + resultParts.push(process.logsUUID) if (includePrintOutput && runTime === RunTimeType.SAS) { const printOutputPath = path.join(session.path, 'output.lst') @@ -137,10 +139,7 @@ export class ExecutionController { ? await readFile(printOutputPath) : '' - if (printOutput) { - resultParts.push(process.logsUUID) - resultParts.push(printOutput) - } + if (printOutput) resultParts.push(printOutput) } return { diff --git a/api/src/controllers/internal/Session.ts b/api/src/controllers/internal/Session.ts index cb3ba68..31ee7f3 100644 --- a/api/src/controllers/internal/Session.ts +++ b/api/src/controllers/internal/Session.ts @@ -190,17 +190,20 @@ ${autoExecContent}` } private scheduleSessionDestroy(session: Session) { - setTimeout(async () => { - if (session.inUse) { - // adding 10 more minutes - const newDeathTimeStamp = parseInt(session.deathTimeStamp) + 10 * 1000 - session.deathTimeStamp = newDeathTimeStamp.toString() - - this.scheduleSessionDestroy(session) - } else { - await this.deleteSession(session) - } - }, parseInt(session.deathTimeStamp) - new Date().getTime() - 100) + setTimeout( + async () => { + if (session.inUse) { + // adding 10 more minutes + const newDeathTimeStamp = parseInt(session.deathTimeStamp) + 10 * 1000 + session.deathTimeStamp = newDeathTimeStamp.toString() + + this.scheduleSessionDestroy(session) + } else { + await this.deleteSession(session) + } + }, + parseInt(session.deathTimeStamp) - new Date().getTime() - 100 + ) } } diff --git a/web/src/components/snackbar.tsx b/web/src/components/snackbar.tsx index ed4328c..150e00c 100644 --- a/web/src/components/snackbar.tsx +++ b/web/src/components/snackbar.tsx @@ -3,12 +3,11 @@ import Snackbar from '@mui/material/Snackbar' import MuiAlert, { AlertProps } from '@mui/material/Alert' import Slide, { SlideProps } from '@mui/material/Slide' -const Alert = React.forwardRef(function Alert( - props, - ref -) { - return -}) +const Alert = React.forwardRef( + function Alert(props, ref) { + return + } +) const Transition = (props: SlideProps) => { return diff --git a/web/src/containers/Studio/internal/components/log/log.module.css b/web/src/containers/Studio/internal/components/log/log.module.css index 0070ee0..4a11699 100644 --- a/web/src/containers/Studio/internal/components/log/log.module.css +++ b/web/src/containers/Studio/internal/components/log/log.module.css @@ -7,8 +7,10 @@ border: none; outline: none; transition: 0.4s; - box-shadow: rgba(0, 0, 0, 0.2) 0px 2px 1px -1px, - rgba(0, 0, 0, 0.14) 0px 1px 1px 0px, rgba(0, 0, 0, 0.12) 0px 1px 3px 0px; + box-shadow: + rgba(0, 0, 0, 0.2) 0px 2px 1px -1px, + rgba(0, 0, 0, 0.14) 0px 1px 1px 0px, + rgba(0, 0, 0, 0.12) 0px 1px 3px 0px; } .ChunkDetails { diff --git a/web/src/index.html b/web/src/index.html index 2b7c8cf..b80a376 100644 --- a/web/src/index.html +++ b/web/src/index.html @@ -1,4 +1,4 @@ - +