mirror of
https://github.com/sasjs/server.git
synced 2026-01-10 07:50:05 +00:00
chore(execution): roll back changes related to returnLog var
This commit is contained in:
@@ -6,7 +6,7 @@ import { PreProgramVars, TreeNode } from '../../types'
|
|||||||
import { generateFileUploadSasCode, getTmpFilesFolderPath } from '../../utils'
|
import { generateFileUploadSasCode, getTmpFilesFolderPath } from '../../utils'
|
||||||
|
|
||||||
export interface ExecutionVars {
|
export interface ExecutionVars {
|
||||||
[key: string]: string | number | undefined | boolean
|
[key: string]: string | number | undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ExecutionController {
|
export class ExecutionController {
|
||||||
@@ -56,7 +56,7 @@ export class ExecutionController {
|
|||||||
|
|
||||||
const varStatments = Object.keys(vars).reduce(
|
const varStatments = Object.keys(vars).reduce(
|
||||||
(computed: string, key: string) =>
|
(computed: string, key: string) =>
|
||||||
key !== '_returnLog' ? `${computed}%let ${key}=${vars[key]};\n` : '',
|
`${computed}%let ${key}=${vars[key]};\n`,
|
||||||
''
|
''
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -135,11 +135,7 @@ ${program}`
|
|||||||
return {
|
return {
|
||||||
webout,
|
webout,
|
||||||
log:
|
log:
|
||||||
(debugValue && debugValue >= 131) ||
|
(debugValue && debugValue >= 131) || session.crashed ? log : undefined
|
||||||
session.crashed ||
|
|
||||||
Object.keys(vars).includes('_returnLog')
|
|
||||||
? log
|
|
||||||
: undefined
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ export interface ExecutionQuery {
|
|||||||
_program: string
|
_program: string
|
||||||
macroVars?: MacroVars
|
macroVars?: MacroVars
|
||||||
_debug?: number
|
_debug?: number
|
||||||
_returnLog?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface FileQuery {
|
export interface FileQuery {
|
||||||
|
|||||||
@@ -86,5 +86,5 @@ export const executeProgramRawValidation = (data: any): Joi.ValidationResult =>
|
|||||||
Joi.object({
|
Joi.object({
|
||||||
_program: Joi.string().required()
|
_program: Joi.string().required()
|
||||||
})
|
})
|
||||||
.pattern(/^/, Joi.alternatives(Joi.string(), Joi.number(), Joi.boolean()))
|
.pattern(/^/, Joi.alternatives(Joi.string(), Joi.number()))
|
||||||
.validate(data)
|
.validate(data)
|
||||||
|
|||||||
Reference in New Issue
Block a user