From c4a3a9ddced0013c8b3a6b8a7583d2fa7a415334 Mon Sep 17 00:00:00 2001 From: "Infineon\\StieberD" Date: Fri, 6 Sep 2024 15:22:15 -0700 Subject: [PATCH] fixed mode change delay --- LSL2/STPROC/MONA_SERVICES.txt | 5 +++-- LSL2/STPROC/REACTOR_LOG_SERVICES.txt | 6 ++--- LSL2/STPROC/REACTOR_SERVICES.txt | 33 ++++++++++++++-------------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/LSL2/STPROC/MONA_SERVICES.txt b/LSL2/STPROC/MONA_SERVICES.txt index 887b880..ef03643 100644 --- a/LSL2/STPROC/MONA_SERVICES.txt +++ b/LSL2/STPROC/MONA_SERVICES.txt @@ -98,12 +98,13 @@ Service SendBufferedStatus(MonaResource, StatusName, StatusValue) Loop while (isSuccessful EQ False$ and retries GT 0) - waitSeconds = (2 - retries) * backoffSeconds + waitSeconds = (3 - retries) * backoffSeconds Delay(waitSeconds) retries = retries - 1 response = Httpclient_Services('SendHTTPRequest', 'POST', ApiUrl, 'Content-Type':@VM:'application/json':@FM:'Accept':@VM:'*/*', RequestBodyJson, '', '', False$, False$, '') + If response EQ '"Request queued for processing"' then isSuccessful = True$ end @@ -154,7 +155,7 @@ Service SendBufferedAverageMetric(MonaResource, MetricName, MetricValue) Loop while (isSuccessful EQ False$ and retries GT 0) - waitSeconds = (2 - retries) * backoffSeconds + waitSeconds = (3 - retries) * backoffSeconds Delay(waitSeconds) retries = retries - 1 diff --git a/LSL2/STPROC/REACTOR_LOG_SERVICES.txt b/LSL2/STPROC/REACTOR_LOG_SERVICES.txt index d794419..8825f63 100644 --- a/LSL2/STPROC/REACTOR_LOG_SERVICES.txt +++ b/LSL2/STPROC/REACTOR_LOG_SERVICES.txt @@ -968,7 +968,7 @@ Service CreateReactorLogPMOrder(RLNo, PmType=PM_TYPES) Loop while (IsSuccessful EQ False$ and Retries GT 0) - WaitSeconds = (2 - retries) * BackoffSeconds + WaitSeconds = (3 - retries) * BackoffSeconds Delay(WaitSeconds) Retries = Retries - 1 @@ -1054,7 +1054,7 @@ Service CancelReactorLogPMOrder(RlNo, OrderId) Loop while (IsSuccessful EQ False$ and Retries GT 0) - WaitSeconds = (2 - Retries) * BackoffSeconds + WaitSeconds = (3 - Retries) * BackoffSeconds Delay(WaitSeconds) Retries = Retries - 1 @@ -1174,7 +1174,7 @@ Service GetReactorLogPMStatus(RlNo) Loop while (IsSuccessful EQ False$ and Retries GT 0) - WaitSeconds = (2 - Retries) * BackoffSeconds + WaitSeconds = (3 - Retries) * BackoffSeconds Delay(WaitSeconds) Retries = Retries - 1 diff --git a/LSL2/STPROC/REACTOR_SERVICES.txt b/LSL2/STPROC/REACTOR_SERVICES.txt index 3201059..4ba6aed 100644 --- a/LSL2/STPROC/REACTOR_SERVICES.txt +++ b/LSL2/STPROC/REACTOR_SERVICES.txt @@ -64,10 +64,10 @@ EQU ENG$ to 5 Declare subroutine Error_Services, Reactor_Services, Memory_Services, RList, Database_Services, SRP_JSON, obj_React_Mode Declare subroutine Excel_Services, Schedule_Services, Logging_Services, Set_Status, obj_React_Status, Errmsg,React_Assign_Conv -Declare subroutine Obj_Notes, Btree.Extract, SRP_Fastarray, Delay, Mona_Services, SRP_List +Declare subroutine Obj_Notes, Btree.Extract, SRP_Fastarray, Delay, Mona_Services, SRP_List, Msg Declare function SRP_Array, Reactor_Services, Memory_Services, Database_Services, SRP_Sort_Array, Excel_Services Declare function SRP_Math, SRP_Hash, SRP_JSON, Epi_Part_Services, Schedule_Services, Date_Services, Environment_Services -Declare function Logging_Services, GetCommandLine, NextKey, Reactor_Log_Services, SRP_DateTime +Declare function Logging_Services, GetCommandLine, NextKey, Reactor_Log_Services, SRP_DateTime, ole_getwebpage Declare function Datetime, Reactor_Modes_Services, Work_Order_Services, React_Mode_NG_Services, Lsl_Users_Services Declare function SRP_Time, Rds_Services, SRP_Fastarray, Httpclient_Services, SRP_List, Utility, Memberof, Error_Services @@ -3234,6 +3234,7 @@ Service GetLoadedRds(ReactNo) end service Service CreateReactorProveInOrder(ReactNo, ProveInType) + Headers = 'Logging DTM' : @FM : 'Machine' : @FM : 'Log' ColumnWidths = 20 : @FM : 15 : @FM : 300 LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\ReactorProveIn' @@ -3282,7 +3283,7 @@ Service CreateReactorProveInOrder(ReactNo, ProveInType) Loop while (IsSuccessful EQ False$ and Retries GT 0) - WaitSeconds = (2 - retries) * BackoffSeconds + WaitSeconds = (3 - retries) * BackoffSeconds Delay(WaitSeconds) Retries = Retries - 1 @@ -3375,19 +3376,23 @@ Service GetReactorProveInStatus(ReactNo) Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$) ProveInUrl = BaseProveInUrl:'checklistOrderId=':ProveInOrderId - + Retries = 3 BackoffSeconds = 1 IsSuccessful = False$ Loop while (IsSuccessful EQ False$ and Retries GT 0) - WaitSeconds = (2 - Retries) * BackoffSeconds - Delay(WaitSeconds) + WaitSeconds = (3 - Retries) * BackoffSeconds + + Delay(WaitSeconds) + + Retries = Retries - 1 - +* Httpclient_Services('SetTimeoutDuration', HttpResponseJson = Httpclient_Services('SendHTTPRequest', 'GET', ProveInUrl, 'Accept':@VM:'*/*', '', '', '', False$, False$, '') + If HttpResponseJson NE '' then ObjResponseJson = '' If SRP_JSON(ObjResponseJson, 'Parse', HttpResponseJson) EQ '' then @@ -3412,7 +3417,6 @@ Service GetReactorProveInStatus(ReactNo) end Repeat Next ProveInOrderId - If Environment_Services('IsProd') then MonAResource = 'GRP_OPENINSIGHT_MES_OP_FE_MESAPROVEINAPI' end else @@ -3425,8 +3429,6 @@ Service GetReactorProveInStatus(ReactNo) LogData<2> = Machine LogData<3> = 'Successfully fetched prove in order for reactor ':ReactNo Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$) - - Mona_Services('SendBufferedStatus', MonAResource, StatusName, 'Ok') end else Response = 'error' @@ -3435,12 +3437,8 @@ Service GetReactorProveInStatus(ReactNo) LogData<2> = Machine LogData<3> = 'Error encountered when fetching prove in order for reactor ':ReactNo Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$) - - Mona_Services('SendBufferedStatus', MonAResource, StatusName, 'Critical') - Error_Services('Add', 'Error in ' : Service : ' service. Could not retrieve NICA order status.') end - ReactorRec = SRP_List("GetVariable", ProveInOrderIdList, @VM) ReactorRec = SRP_List("GetVariable", ProveInTypeList, @VM) SRP_List('Release', ProveInTypeList) @@ -3484,8 +3482,11 @@ Service CancelReactorProveIn(ReactNo, OrderId) Loop while (IsSuccessful EQ False$ and Retries GT 0) - WaitSeconds = (2 - Retries) * BackoffSeconds - Delay(WaitSeconds) + WaitSeconds = (3 - Retries) * BackoffSeconds + + Delay(WaitSeconds) + + Retries = Retries - 1