From 60b5386f274e1cf66881b7c745e9aa3bfa4a6f4b Mon Sep 17 00:00:00 2001 From: "Infineon\\StieberD" Date: Thu, 26 Jun 2025 16:24:10 -0700 Subject: [PATCH] modified logging dtm to include seconds --- LSL2/STPROC/MONA_SERVICES.txt | 68 +++++++++++++++++------------------ 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/LSL2/STPROC/MONA_SERVICES.txt b/LSL2/STPROC/MONA_SERVICES.txt index 0d8187f..09429ae 100644 --- a/LSL2/STPROC/MONA_SERVICES.txt +++ b/LSL2/STPROC/MONA_SERVICES.txt @@ -300,14 +300,12 @@ Service ProcessMonaQueue(NumRequests) Lock hSysLists, ServiceKeyID then LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\MonA' LogDate = Oconv(Date(), 'D4/') - LogTime = Oconv(Time(), 'MTS') LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : ' MonA Queue Log.csv' Headers = 'Logging DTM':@FM:'Log Data' objMonaQueueLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, COMMA$, Headers, '', False$, False$) - LoggingDTM = LogDate : ' ' : LogTime ; // Logging DTM LogData = '' - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Begin ProcessMonaQueue' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) @@ -316,12 +314,12 @@ Service ProcessMonaQueue(NumRequests) If Num(NumRequests) then NumRequests = Abs(Int(NumRequests)) If NumRequests GT MAX_REQUESTS$ then - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Requested NumRequests ':NumRequests:' is above predefined limit. Overriding NumRequests and setting to ':MAX_REQUESTS$:'.' NumRequests = MAX_REQUESTS$ Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Attempting to process up to ':NumRequests:' MONA_QUEUE requests.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) @@ -359,7 +357,7 @@ Service ProcessMonaQueue(NumRequests) SRP_Json(objMonaStatusJsonArray, 'Add', objStatus) SRP_Json(objStatus, 'Release') StatusRequests<-1> = MonaQueueId - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully added MONA_QUEUE ':MonaQueueId:' to objMonaStatusJsonArray.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end else @@ -377,7 +375,7 @@ Service ProcessMonaQueue(NumRequests) SRP_Json(objMonaMetricAvgJsonArray, 'Add', objAverage) SRP_Json(objAverage, 'Release') AverageRequests<-1> = MonaQueueId - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully added MONA_QUEUE ':MonaQueueId:' to objMonaMetricAvgJsonArray.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end else @@ -395,7 +393,7 @@ Service ProcessMonaQueue(NumRequests) SRP_Json(objMonaMetricCountJsonArray, 'Add', objCount) SRP_Json(objCount, 'Release') CountRequests<-1> = MonaQueueId - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully added MONA_QUEUE ':MonaQueueId:' to objMonaMetricCountJsonArray.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end else @@ -407,13 +405,13 @@ Service ProcessMonaQueue(NumRequests) Case Otherwise$ // Invalid request InvalidRequests<-1> = MonaQueueId - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Encountered invalid MONA_QUEUE ':MonaQueueId:' request. Marking request for deletion.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) End Case end else ErrorMsg = 'Error in ':Service:' service. Error reading MONA_QUEUE ':MonaQueueId:'.' - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Error reading MONA_QUEUE ':MonaQueueId:' request.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end @@ -427,34 +425,34 @@ Service ProcessMonaQueue(NumRequests) If StatusArraySize GT 0 then // Send bulk status request MonaStatusJson = SRP_Json(objMonaStatusJsonArray, 'Stringify', 'Fast') - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Attempting to send bulk status request to MonInBufferedWorker API.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) Mona_Services('SendMonaHttpRequest', 'status/bulk', MonaStatusJson) If Error_Services('NoError') then - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully sent bulk status request to MonInBufferedWorker API.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) // Delete status requests from queue For each MonaStatusQueueId in StatusRequests using @FM Delete hMonaQueue, MonaStatusQueueId then - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully deleted MONA_QUEUE ':MonaStatusQueueId:' request.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end else - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Error in ':Service:' service. Error deleting MONA_QUEUE ':MonaStatusQueueId:'.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end Next MonaStatusQueueId end else ErrorMsg = Error_Services('GetMessage') - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Failed to send bulk status request to MonInBufferedWorker API. Error message: ':ErrorMsg Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end end else - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'No status requests to send to MonInBufferedWorker API.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end @@ -463,34 +461,34 @@ Service ProcessMonaQueue(NumRequests) If AverageArraySize GT 0 then // Send bulk average request MonaMetricAvgJson = SRP_Json(objMonaMetricAvgJsonArray, 'Stringify', 'Fast') - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Attempting to send bulk average request to MonInBufferedWorker API.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) Mona_Services('SendMonaHttpRequest', 'average/bulk', MonaMetricAvgJson) If Error_Services('NoError') then - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully sent bulk average request to MonInBufferedWorker API.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) // Delete average requests from queue For each MonaAverageQueueId in AverageRequests using @FM Delete hMonaQueue, MonaAverageQueueId then - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully deleted MONA_QUEUE ':MonaAverageQueueId:' request.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end else - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Error in ':Service:' service. Error deleting MONA_QUEUE ':MonaAverageQueueId:'.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end Next MonaAverageQueueId end else ErrorMsg = Error_Services('GetMessage') - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Failed to send bulk average request to MonInBufferedWorker API. Error message: ':ErrorMsg Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end end else - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'No average requests to send to MonInBufferedWorker API.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end @@ -499,34 +497,34 @@ Service ProcessMonaQueue(NumRequests) If CountArraySize GT 0 then // Send bulk count request MonaMetricCountJson = SRP_Json(objMonaMetricCountJsonArray, 'Stringify', 'Fast') - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Attempting to send bulk count request to MonInBufferedWorker API.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) Mona_Services('SendMonaHttpRequest', 'count/bulk', MonaMetricCountJson) If Error_Services('NoError') then - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully sent bulk count request to MonInBufferedWorker API.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) // Delete count requests from queue For each MonaCountQueueId in CountRequests using @FM Delete hMonaQueue, MonaCountQueueId then - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully deleted MONA_QUEUE ':MonaCountQueueId:' request.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end else - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Error in ':Service:' service. Error deleting MONA_QUEUE ':MonaCountQueueId:'.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end Next MonaCountQueueId end else ErrorMsg = Error_Services('GetMessage') - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Failed to send bulk count request to MonInBufferedWorker API. Error message: ':ErrorMsg Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end end else - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'No count requests to send to MonInBufferedWorker API.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end @@ -534,11 +532,11 @@ Service ProcessMonaQueue(NumRequests) If InvalidRequests NE '' then For each InvalidRequestQueueId in InvalidRequests using @FM Delete hMonaQueue, InvalidRequestQueueId then - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully deleted invalid MONA_QUEUE ':InvalidRequestQueueId:' request.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end else - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Error in ':Service:' service. Error deleting invalid MONA_QUEUE ':InvalidRequestQueueId:' request.' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) end @@ -546,15 +544,15 @@ Service ProcessMonaQueue(NumRequests) end LogData = '' - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully processed ':DCount(StatusRequests, @FM): ' status requests' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) LogData = '' - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully processed ':DCount(AverageRequests, @FM): ' average requests' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) LogData = '' - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'Successfully processed ':DCount(CountRequests, @FM): ' count requests' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM) @@ -586,7 +584,7 @@ Service ProcessMonaQueue(NumRequests) Recipients = '' SentFrom = 'SYSTEM' Subject = Service:' Error' - Message = OConv(Datetime(), 'DT2/^H') + Message = OConv(Datetime(), 'DT/^S') Server = Environment_Services('GetServer') Message<2> = 'Error on server ':Server Message<3> = 'Error message: ':ErrorMsg @@ -599,7 +597,7 @@ Service ProcessMonaQueue(NumRequests) end LogData = '' - LogData<1> = OConv(Datetime(), 'DT2/^H') + LogData<1> = OConv(Datetime(), 'DT/^S') LogData<2> = 'End ProcessMonaQueue' Logging_Services('AppendLog', objMonaQueueLog, LogData, @RM, @FM)