phares3757/open-insight
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added check to verify PROC_NAME exists before invoking

Browse Source
This commit is contained in:
Infineon\StieberD
2025-07-14 09:36:07 -07:00
committed by Stieber Daniel (CSC FI SPS MESLEO)
parent cd64511871
commit 804b590773
1 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
LSL2/STPROC/SERVICE_SERVICES.txt
View File

@ -212,9 +212,9 @@ end service
Service ProcessRequest(RequestKeyID) Service ProcessRequest(RequestKeyID)
If RequestKeyID NE '' then If RequestKeyID NE '' then
DeleteRequest = True$ Server = Environment_Services('GetServer')
Server = Environment_Services('GetServer') InvalidRequest = False$
Done = True$ DeleteRequest = True$
If RowExists('PROC_QUEUE2', RequestKeyID) then If RowExists('PROC_QUEUE2', RequestKeyID) then
RequestRow = Database_Services('ReadDataRow', 'PROC_QUEUE2', RequestKeyID) RequestRow = Database_Services('ReadDataRow', 'PROC_QUEUE2', RequestKeyID)
If RequestRow NE '' then If RequestRow NE '' then
@ -222,28 +222,38 @@ Service ProcessRequest(RequestKeyID)
Procedure = UCase(Procedure) Procedure = UCase(Procedure)
Params = RequestRow<PROC_QUEUE.PARAMS$> Params = RequestRow<PROC_QUEUE.PARAMS$>
If Procedure NE '' then If Procedure NE '' then
Dim ProcParams(12) LSL2Key = '$':Procedure:'*LSL2'
For each Param in Params using @VM setting pPos FrameworksKey = '$':Procedure:'*FRAMEWORKS'
ProcParams(pPos) = Param SysprogKey = '$':Procedure
Next Param If RowExists('SYSOBJ', LSL2Key) or RowExists('SYSOBJ', FrameworksKey) or RowExists('SYSOBJ', SysprogKey) then
NumArguments = DCount(Params, @VM) Dim ProcParams(11)
For each Param in Params using @VM setting pPos
Begin Case ProcParams(pPos) = Param
Case NumArguments EQ 0 ; Call @Procedure() Next Param
Case NumArguments EQ 1 ; Call @Procedure(ProcParams(1)) NumArguments = DCount(Params, @VM)
Case NumArguments EQ 2 ; Call @Procedure(ProcParams(1), ProcParams(2)) Begin Case
Case NumArguments EQ 3 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3)) Case NumArguments EQ 0 ; Call @Procedure()
Case NumArguments EQ 4 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4)) Case NumArguments EQ 1 ; Call @Procedure(ProcParams(1))
Case NumArguments EQ 5 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5)) Case NumArguments EQ 2 ; Call @Procedure(ProcParams(1), ProcParams(2))
Case NumArguments EQ 6 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5), ProcParams(6)) Case NumArguments EQ 3 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3))
Case NumArguments EQ 7 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5), ProcParams(6), ProcParams(7)) Case NumArguments EQ 4 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4))
Case NumArguments EQ 8 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5), ProcParams(6), ProcParams(7), ProcParams(8)) Case NumArguments EQ 5 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5))
Case NumArguments EQ 9 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5), ProcParams(6), ProcParams(7), ProcParams(8), ProcParams(9)) Case NumArguments EQ 6 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5), ProcParams(6))
Case NumArguments EQ 10 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5), ProcParams(6), ProcParams(7), ProcParams(8), ProcParams(9), ProcParams(10)) Case NumArguments EQ 7 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5), ProcParams(6), ProcParams(7))
Case NumArguments EQ 11 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5), ProcParams(6), ProcParams(7), ProcParams(8), ProcParams(9), ProcParams(10), ProcParams(11)) Case NumArguments EQ 8 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5), ProcParams(6), ProcParams(7), ProcParams(8))
Case Otherwise$ Case NumArguments EQ 9 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5), ProcParams(6), ProcParams(7), ProcParams(8), ProcParams(9))
Error_Services('Add', 'Error in ':Service:' service. More than 11 arguments are not currently supported.') Case NumArguments EQ 10 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5), ProcParams(6), ProcParams(7), ProcParams(8), ProcParams(9), ProcParams(10))
End Case Case NumArguments EQ 11 ; Call @Procedure(ProcParams(1), ProcParams(2), ProcParams(3), ProcParams(4), ProcParams(5), ProcParams(6), ProcParams(7), ProcParams(8), ProcParams(9), ProcParams(10), ProcParams(11))
Case Otherwise$
Error_Services('Add', 'Error in ':Service:' service. More than 11 arguments are not currently supported.')
End Case
end else
InvalidRequest = True$
Error_Services('Add', 'Error in ':Service:' service. PROC_NAME ':Quote(Procedure):' does not exist.')
end
end else
InvalidRequest = True$
Error_Services('Add', 'Error in ':Service:' service. Null PROC_NAME posted to queue.')
end end
Swap @VM with ',' in Params Swap @VM with ',' in Params
@ -253,10 +263,10 @@ Service ProcessRequest(RequestKeyID)
LogData<4> = Procedure LogData<4> = Procedure
LogData<5> = Params LogData<5> = Params
ErrCode = '' ErrCode = ''
If ( Get_Status(ErrCode) or Error_Services('HasError') ) then If ( Get_Status(ErrCode) or Error_Services('HasError') or InvalidRequest) then
NumAttempts = RequestRow<PROC_QUEUE.NUM_ATTEMPTS$> + 1 NumAttempts = RequestRow<PROC_QUEUE.NUM_ATTEMPTS$> + 1
ErrorMessage = Error_Services('GetMessage') ErrorMessage = Error_Services('GetMessage')
If NumAttempts LT 3 then If ( (NumAttempts LT 3) and Not(InvalidRequest) ) then
DeleteRequest = False$ DeleteRequest = False$
RequestRow<PROC_QUEUE.NUM_ATTEMPTS$> = NumAttempts RequestRow<PROC_QUEUE.NUM_ATTEMPTS$> = NumAttempts
RequestRow<PROC_QUEUE.LAST_ATTEMPT_DTM$> = Datetime() RequestRow<PROC_QUEUE.LAST_ATTEMPT_DTM$> = Datetime()