Deprecating old services. Refactored codebase to not use SwapResources GoSub.
This commit is contained in:
Infineon\StieberD
@ -38,31 +38,31 @@ Service RunMonitors()
|
||||
RList(Query, TARGET_ACTIVELIST$, '', '', '')
|
||||
QueueCount = @RecCount
|
||||
GoSub ClearCursors
|
||||
Mona_Services('SendMetric', 'SQL_BACKLOG', 'SQL_BACKLOG', QueueCount)
|
||||
Mona_Services('PostAverageMetric', 'SQL_BACKLOG', 'SQL_BACKLOG', QueueCount)
|
||||
|
||||
Query = 'SELECT SQL_PENDING'
|
||||
RList(Query, TARGET_ACTIVELIST$, '', '', '')
|
||||
QueueCount = @RecCount
|
||||
GoSub ClearCursors
|
||||
Mona_Services('SendMetric', 'SQL_PENDING', 'SQL_PENDING', QueueCount)
|
||||
Mona_Services('PostAverageMetric', 'SQL_PENDING', 'SQL_PENDING', QueueCount)
|
||||
|
||||
Query = 'SELECT PROC_QUEUE2'
|
||||
RList(Query, TARGET_ACTIVELIST$, '', '', '')
|
||||
QueueCount = @RecCount
|
||||
GoSub ClearCursors
|
||||
Mona_Services('SendMetric', 'GRP_OPENINSIGHT_MES_OP_FE_SERVICE_MANANGER', 'PROC_QUEUE', QueueCount)
|
||||
Mona_Services('PostAverageMetric', 'GRP_OPENINSIGHT_MES_OP_FE_SERVICE_MANANGER', 'PROC_QUEUE', QueueCount)
|
||||
|
||||
Query = 'SELECT TRANSACTION_QUEUE'
|
||||
RList(Query, TARGET_ACTIVELIST$, '', '', '')
|
||||
QueueCount = @RecCount
|
||||
GoSub ClearCursors
|
||||
Mona_Services('SendMetric', 'GRP_OPENINSIGHT_MES_OP_FE_SERVICE_MANANGER', 'TRANSACTION_QUEUE', QueueCount)
|
||||
Mona_Services('PostAverageMetric', 'GRP_OPENINSIGHT_MES_OP_FE_SERVICE_MANANGER', 'TRANSACTION_QUEUE', QueueCount)
|
||||
|
||||
Query = 'SELECT MONA_QUEUE'
|
||||
RList(Query, TARGET_ACTIVELIST$, '', '', '')
|
||||
QueueCount = @RecCount
|
||||
GoSub ClearCursors
|
||||
Mona_Services('SendMetric', 'GRP_OPENINSIGHT_MES_OP_FE_SERVICE_MANANGER', 'MONA_QUEUE', QueueCount)
|
||||
Mona_Services('PostAverageMetric', 'GRP_OPENINSIGHT_MES_OP_FE_SERVICE_MANANGER', 'MONA_QUEUE', QueueCount)
|
||||
|
||||
GoSub SAPHeartbeat
|
||||
GoSub MonitorMetrologyDirs
|
||||
@ -82,12 +82,12 @@ SAPHeartbeat:
|
||||
CurrDTM = SRP_Datetime('Now')
|
||||
If SAPHeartbeatDTM NE '' then
|
||||
If SRP_Datetime('MinuteSpan', SAPHeartbeatDTM, CurrDTM) LT 5 then
|
||||
Mona_Services('SendStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP', 'Heartbeat', 'OK')
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP', 'Heartbeat', 'OK')
|
||||
end else
|
||||
Mona_Services('SendStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP', 'Heartbeat', 'CRITICAL')
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP', 'Heartbeat', 'CRITICAL')
|
||||
end
|
||||
end else
|
||||
Mona_Services('SendStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP', 'Heartbeat', 'WARNING')
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP', 'Heartbeat', 'WARNING')
|
||||
end
|
||||
|
||||
return
|
||||
@ -106,8 +106,8 @@ MonitorMetrologyDirs:
|
||||
end else
|
||||
TencorOldestFileAgeMinute = SRP_Datetime('MinuteSpan', TencorOldestFileDTM, CurrDTM)
|
||||
end
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_COUNT', TencorInstanceName, TencorFileCount)
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_AGE', TencorInstanceName, TencorOldestFileAgeMinute)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_COUNT', TencorInstanceName, TencorFileCount)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_AGE', TencorInstanceName, TencorOldestFileAgeMinute)
|
||||
|
||||
//HGCV
|
||||
HGCVInstanceName = 'MET08RESIHGCV'
|
||||
@ -119,8 +119,8 @@ MonitorMetrologyDirs:
|
||||
end else
|
||||
HGCVOldestFileAgeMinute = SRP_Datetime('MinuteSpan', HGCVOldestFileDTM, CurrDTM)
|
||||
end
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_COUNT', HGCVInstanceName, HGCVFileCount)
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_AGE', HGCVInstanceName, HGCVOldestFileAgeMinute)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_COUNT', HGCVInstanceName, HGCVFileCount)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_AGE', HGCVInstanceName, HGCVOldestFileAgeMinute)
|
||||
|
||||
//CDE
|
||||
CDEInstanceName = 'MET08RESIMAPCDE'
|
||||
@ -132,8 +132,8 @@ MonitorMetrologyDirs:
|
||||
end else
|
||||
CDEOldestFileAgeMinute = SRP_Datetime('MinuteSpan', CDEOldestFileDTM, CurrDTM)
|
||||
end
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_COUNT', CDEInstanceName, CDEFileCount)
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_AGE', CDEInstanceName, CDEOldestFileAgeMinute)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_COUNT', CDEInstanceName, CDEFileCount)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_AGE', CDEInstanceName, CDEOldestFileAgeMinute)
|
||||
|
||||
//BioRad
|
||||
BioRadInstanceName = 'MET08THFTIRQS408M'
|
||||
@ -145,8 +145,8 @@ MonitorMetrologyDirs:
|
||||
end else
|
||||
BioRadOldestFileAgeMinute = SRP_Datetime('MinuteSpan', BioRadOldestFileDTM, CurrDTM)
|
||||
end
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_COUNT', BioRadInstanceName, BioRadFileCount)
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_AGE', BioRadInstanceName, BioRadOldestFileAgeMinute)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_COUNT', BioRadInstanceName, BioRadFileCount)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_AGE', BioRadInstanceName, BioRadOldestFileAgeMinute)
|
||||
|
||||
//Stratus
|
||||
StratusInstanceName = 'MET08THFTIRSTRATUS'
|
||||
@ -158,8 +158,8 @@ MonitorMetrologyDirs:
|
||||
end else
|
||||
StratusOldestFileAgeMinute = SRP_Datetime('MinuteSpan', StratusOldestFileDTM, CurrDTM)
|
||||
end
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_COUNT', StratusInstanceName, StratusFileCount)
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_AGE', StratusInstanceName, StratusOldestFileAgeMinute)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_COUNT', StratusInstanceName, StratusFileCount)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_AGE', StratusInstanceName, StratusOldestFileAgeMinute)
|
||||
|
||||
//SP1
|
||||
SP1InstanceName = 'MET08DDUPSP1TBI'
|
||||
@ -171,8 +171,8 @@ MonitorMetrologyDirs:
|
||||
end else
|
||||
SP1OldestFileAgeMinute = SRP_Datetime('MinuteSpan', SP1OldestFileDTM, CurrDTM)
|
||||
end
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_COUNT', SP1InstanceName, SP1FileCount)
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_AGE', SP1InstanceName, SP1OldestFileAgeMinute)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_COUNT', SP1InstanceName, SP1FileCount)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_AGE', SP1InstanceName, SP1OldestFileAgeMinute)
|
||||
|
||||
//SPV
|
||||
SPVInstanceName = 'MET08RESISRP2100'
|
||||
@ -184,8 +184,8 @@ MonitorMetrologyDirs:
|
||||
end else
|
||||
SPVOldestFileAgeMinute = SRP_Datetime('MinuteSpan', SPVOldestFileDTM, CurrDTM)
|
||||
end
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_COUNT', SPVInstanceName, SPVFileCount)
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_AGE', SPVInstanceName, SPVOldestFileAgeMinute)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_COUNT', SPVInstanceName, SPVFileCount)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_AGE', SPVInstanceName, SPVOldestFileAgeMinute)
|
||||
|
||||
//SRP
|
||||
SRPInstanceName = 'MET08ANLYSDIFAAST230'
|
||||
@ -197,8 +197,8 @@ MonitorMetrologyDirs:
|
||||
end else
|
||||
SRPOldestFileAgeMinute = SRP_Datetime('MinuteSpan', SRPOldestFileDTM, CurrDTM)
|
||||
end
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_COUNT', SRPInstanceName, SRPFileCount)
|
||||
Mona_Services('SendMetric', 'EXPORT_TO_OI_FILE_AGE', SRPInstanceName, SRPOldestFileAgeMinute)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_COUNT', SRPInstanceName, SRPFileCount)
|
||||
Mona_Services('PostAverageMetric', 'EXPORT_TO_OI_FILE_AGE', SRPInstanceName, SRPOldestFileAgeMinute)
|
||||
|
||||
return
|
||||
|
||||
|
||||
@ -49,13 +49,6 @@ Options REQUEST_TYPE = 'status', 'average', 'count', 'status/bulk', 'average/bul
|
||||
// Services
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Service SendStatus(MonitorName=MONITORS, StatusName, CurrentState=STATES)
|
||||
|
||||
Mona_Services("PostStatus", MonitorName, StatusName, CurrentState)
|
||||
|
||||
end service
|
||||
|
||||
|
||||
Service PostStatus(MonitorName, StatusName, CurrentState=STATES)
|
||||
|
||||
MonaQId = RTI_CreateGuid()
|
||||
@ -69,13 +62,6 @@ Service PostStatus(MonitorName, StatusName, CurrentState=STATES)
|
||||
end service
|
||||
|
||||
|
||||
Service SendMetric(MonitorName=MONITORS, MetricName, Number)
|
||||
|
||||
Mona_Services("PostAverageMetric", MonitorName, MetricName, Number)
|
||||
|
||||
end Service
|
||||
|
||||
|
||||
Service PostAverageMetric(MonitorName, MetricName, Number)
|
||||
|
||||
MonaQId = RTI_CreateGuid()
|
||||
@ -90,13 +76,6 @@ Service PostAverageMetric(MonitorName, MetricName, Number)
|
||||
end service
|
||||
|
||||
|
||||
Service SendCountMetric(MonitorName=MONITORS, MetricName, Number)
|
||||
|
||||
Mona_Services("PostCountMetric", MonitorName, MetricName, Number)
|
||||
|
||||
end Service
|
||||
|
||||
|
||||
Service PostCountMetric(MonitorName, MetricName, Number)
|
||||
|
||||
MonaQId = RTI_CreateGuid()
|
||||
@ -111,185 +90,11 @@ Service PostCountMetric(MonitorName, MetricName, Number)
|
||||
end service
|
||||
|
||||
|
||||
Service SendBufferedStatus(MonaResource, StatusName, StatusValue)
|
||||
|
||||
If MonaResource EQ '' then
|
||||
MonaResource = Environment_Services("GetMonaResource")
|
||||
end
|
||||
|
||||
Prod = Environment_Services('IsProd')
|
||||
If Not(Prod) then GoSub SwapResourceNames
|
||||
|
||||
DateTime = SRP_DateTime('Now')
|
||||
Year = SRP_Datetime("Year", DateTime)
|
||||
Month = SRP_Datetime("Month", DateTime)
|
||||
If Len(Month) EQ 1 then
|
||||
Month = '0':Month
|
||||
end
|
||||
Day = SRP_Datetime("Day", DateTime)
|
||||
If Len(Day) EQ 1 then
|
||||
Day = '0':Day
|
||||
end
|
||||
Hour = SRP_Datetime("Hour", DateTime)
|
||||
If Len(Hour) EQ 1 then
|
||||
Hour = '0':Hour
|
||||
end
|
||||
Minute = SRP_Datetime("Minute", DateTime)
|
||||
If Len(Minute) EQ 1 then
|
||||
Minute = '0':Minute
|
||||
end
|
||||
Second = SRP_Datetime("Second", DateTime)
|
||||
If Len(Second) EQ 1 then
|
||||
Second = '0':Second
|
||||
end
|
||||
|
||||
RequestBodyJson = '{ "resource": "':MonaResource:'"'
|
||||
RequestBodyJson = RequestBodyJson:', "dateTime": "':Year:'-':Month:'-':Day:'T':Hour:':':Minute:':':Second:'Z"'
|
||||
RequestBodyJson = RequestBodyJson:', "statusName": "':StatusName:'"'
|
||||
RequestBodyJson = RequestBodyJson:', "statusValue": "':StatusValue:'" }'
|
||||
|
||||
ApiUrl = Environment_Services("GetMonInBufferedWorkerApiUrl"):'/status'
|
||||
|
||||
retries = 3
|
||||
backoffSeconds = 1
|
||||
isSuccessful = False$
|
||||
|
||||
Loop
|
||||
while (isSuccessful EQ False$ and retries GT 0)
|
||||
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
|
||||
Repeat
|
||||
|
||||
end service
|
||||
|
||||
|
||||
Service SendBufferedAverageMetric(MonaResource, MetricName, MetricValue)
|
||||
|
||||
If MonaResource EQ '' then
|
||||
MonaResource = Environment_Services("GetMonaResource")
|
||||
end
|
||||
|
||||
DateTime = SRP_DateTime('Now')
|
||||
Year = SRP_Datetime("Year", DateTime)
|
||||
Month = SRP_Datetime("Month", DateTime)
|
||||
If Len(Month) EQ 1 then
|
||||
Month = '0':Month
|
||||
end
|
||||
Day = SRP_Datetime("Day", DateTime)
|
||||
If Len(Day) EQ 1 then
|
||||
Day = '0':Day
|
||||
end
|
||||
Hour = SRP_Datetime("Hour", DateTime)
|
||||
If Len(Hour) EQ 1 then
|
||||
Hour = '0':Hour
|
||||
end
|
||||
Minute = SRP_Datetime("Minute", DateTime)
|
||||
If Len(Minute) EQ 1 then
|
||||
Minute = '0':Minute
|
||||
end
|
||||
Second = SRP_Datetime("Second", DateTime)
|
||||
If Len(Second) EQ 1 then
|
||||
Second = '0':Second
|
||||
end
|
||||
|
||||
RequestBodyJson = '{ "resource": "':MonaResource:'"'
|
||||
RequestBodyJson = RequestBodyJson:', "dateTime": "':Year:'-':Month:'-':Day:'T':Hour:':':Minute:':':Second:'Z"'
|
||||
RequestBodyJson = RequestBodyJson:', "metricName": "':MetricName:'"'
|
||||
RequestBodyJson = RequestBodyJson:', "metricValue": "':MetricValue:'" }'
|
||||
|
||||
ApiUrl = Environment_Services("GetMonInBufferedWorkerApiUrl"):'/average'
|
||||
|
||||
retries = 3
|
||||
backoffSeconds = 1
|
||||
isSuccessful = False$
|
||||
|
||||
Loop
|
||||
while (isSuccessful EQ False$ and retries GT 0)
|
||||
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
|
||||
Repeat
|
||||
|
||||
end service
|
||||
|
||||
|
||||
Service SendBufferedCountMetric(MonaResource, MetricName, MetricValue)
|
||||
|
||||
If MonaResource EQ '' then
|
||||
MonaResource = Environment_Services("GetMonaResource")
|
||||
end
|
||||
|
||||
DateTime = SRP_DateTime('Now')
|
||||
Year = SRP_Datetime("Year", DateTime)
|
||||
Month = SRP_Datetime("Month", DateTime)
|
||||
If Len(Month) EQ 1 then
|
||||
Month = '0':Month
|
||||
end
|
||||
Day = SRP_Datetime("Day", DateTime)
|
||||
If Len(Day) EQ 1 then
|
||||
Day = '0':Day
|
||||
end
|
||||
Hour = SRP_Datetime("Hour", DateTime)
|
||||
If Len(Hour) EQ 1 then
|
||||
Hour = '0':Hour
|
||||
end
|
||||
Minute = SRP_Datetime("Minute", DateTime)
|
||||
If Len(Minute) EQ 1 then
|
||||
Minute = '0':Minute
|
||||
end
|
||||
Second = SRP_Datetime("Second", DateTime)
|
||||
If Len(Second) EQ 1 then
|
||||
Second = '0':Second
|
||||
end
|
||||
|
||||
RequestBodyJson = '{ "resource": "':MonaResource:'"'
|
||||
RequestBodyJson = RequestBodyJson:', "dateTime": "':Year:'-':Month:'-':Day:'T':Hour:':':Minute:':':Second:'Z"'
|
||||
RequestBodyJson = RequestBodyJson:', "metricName": "':MetricName:'"'
|
||||
RequestBodyJson = RequestBodyJson:', "metricValue": "':MetricValue:'" }'
|
||||
|
||||
ApiUrl = Environment_Services("GetMonInBufferedWorkerApiUrl"):'/count'
|
||||
|
||||
retries = 3
|
||||
backoffSeconds = 1
|
||||
isSuccessful = False$
|
||||
|
||||
Loop
|
||||
while (isSuccessful EQ False$ and retries GT 0)
|
||||
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
|
||||
Repeat
|
||||
|
||||
end service
|
||||
|
||||
|
||||
Service QueueLatencyAndCountMetrics(MonaResource, MetricName, StartTick, EndTick)
|
||||
|
||||
Diff = EndTick - StartTick
|
||||
Mona_Services('SendMetric', MonaResource, MetricName:'_LATENCY', Diff)
|
||||
Mona_Services('SendCountMetric', MonaResource, MetricName:'_COUNT', 1)
|
||||
Mona_Services('PostAverageMetric', MonaResource, MetricName:'_LATENCY', Diff)
|
||||
Mona_Services('PostCountMetric', MonaResource, MetricName:'_COUNT', 1)
|
||||
|
||||
end service
|
||||
|
||||
@ -769,29 +574,6 @@ end service
|
||||
// Internal GoSubs
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
SwapResourceNames:
|
||||
|
||||
// Swap out prod resource name with dev resource name
|
||||
Begin Case
|
||||
Case ( (MonaResource EQ 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND') and (StatusName EQ 'SFTP-Interface-Outbound') )
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_OUTBOUND'
|
||||
StatusName = 'SFTP-Interface-Outbound-Dev'
|
||||
|
||||
Case ( (MonaResource EQ 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND') and (StatusName EQ 'SetSAPBatchQueue') )
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_INBOUND'
|
||||
StatusName = 'SetSAPBatchQueue-Dev'
|
||||
|
||||
Case ( (MonaResource EQ 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND') and (StatusName EQ 'SFTP-Interface-Inbound') )
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_INBOUND'
|
||||
StatusName = 'SFTP-Interface-Inbound-Dev'
|
||||
|
||||
Case (MonaResource EQ 'GRP_OPENINSIGHT_MES_OP_FE_NICAINTEGRATIONSERVICE')
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_NICAINTEGRATIONSERVICE_DEV'
|
||||
End Case
|
||||
|
||||
return
|
||||
|
||||
|
||||
ClearCursors:
|
||||
|
||||
For counter = 0 to 8
|
||||
|
||||
@ -43,6 +43,13 @@ LogDate = Oconv(Date(), 'D4/')
|
||||
LogTime = Oconv(Time(), 'MTS')
|
||||
LoggingDTM = LogDate : ' ' : LogTime ; // Logging DTM
|
||||
|
||||
IsProd = Environment_Services('IsProd')
|
||||
If IsProd EQ True$ then
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_NICAINTEGRATIONSERVICE'
|
||||
end else
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_NICAINTEGRATIONSERVICE_DEV'
|
||||
end
|
||||
|
||||
GoToService
|
||||
|
||||
Return Response or ""
|
||||
@ -533,7 +540,6 @@ Service CreateNewOrder(EntityType=ENTITY_TYPES, EntityID, OrderType=ORDER_TYPES,
|
||||
end
|
||||
|
||||
// Send MonA status
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_NICAINTEGRATIONSERVICE'
|
||||
StatusName = 'CreateNicaOrder'
|
||||
If IsSuccessful then
|
||||
LogData = ''
|
||||
@ -541,10 +547,10 @@ Service CreateNewOrder(EntityType=ENTITY_TYPES, EntityID, OrderType=ORDER_TYPES,
|
||||
LogData<2> = Machine
|
||||
LogData<3> = 'Successfully created Nica order for entity ':EntityType:' ':EntityID:' of type ':OrderType
|
||||
Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$)
|
||||
Mona_Services('PostStatus', MonAResource, StatusName, 'Ok')
|
||||
Mona_Services('PostStatus', MonaResource, StatusName, 'Ok')
|
||||
end else
|
||||
ErrorMsg = 'Error encountered when attempting to create Nica in order for reactor ':ReactNo:' of type ':OrderType
|
||||
Mona_Services('PostStatus', MonAResource, StatusName, 'Critical')
|
||||
Mona_Services('PostStatus', MonaResource, StatusName, 'Critical')
|
||||
end
|
||||
end
|
||||
end else
|
||||
@ -688,7 +694,6 @@ Service CancelOrder(OrderId)
|
||||
SRP_JSON(ObjResponseJson, 'Release')
|
||||
Repeat
|
||||
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_NICAINTEGRATIONSERVICE'
|
||||
StatusName = 'CancelNicaOrder'
|
||||
If ( (IsSuccessful EQ True$) and (Response NE 'error') and (ErrorMsg EQ '') ) then
|
||||
LogData = ''
|
||||
@ -696,10 +701,10 @@ Service CancelOrder(OrderId)
|
||||
LogData<2> = Machine
|
||||
LogData<3> = 'Successfully cancelled Nica order ' : OrderId : ' for reactor ' : ReactNo
|
||||
Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$)
|
||||
Mona_Services('PostStatus', MonAResource, StatusName, 'Ok')
|
||||
Mona_Services('PostStatus', MonaResource, StatusName, 'Ok')
|
||||
end else
|
||||
ErrorMsg = 'Error encountered cancelling Nica order ' : OrderId : ' for reactor ' : ReactNo
|
||||
Mona_Services('PostStatus', MonAResource, StatusName, 'Critical')
|
||||
Mona_Services('PostStatus', MonaResource, StatusName, 'Critical')
|
||||
end
|
||||
end else
|
||||
ErrorMsg = Error_Services('GetMessage')
|
||||
@ -906,19 +911,18 @@ Service GetOrderStatusUpdate(OrderId)
|
||||
end
|
||||
Repeat
|
||||
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_NICAINTEGRATIONSERVICE'
|
||||
StatusName = 'GetNicaOrderUpdate'
|
||||
If IsSuccessful and Response NE 'error' then
|
||||
LogData = ''
|
||||
LogData<1> = Oconv(Date(), 'D4/') : ' ' : Oconv(Time(), 'MTS') ; // Logging DTM
|
||||
LogData<2> = Machine
|
||||
LogData<3> = 'Successfully updated Nica order ':OrderId:' for reactor ':ReactNo:'.'
|
||||
Mona_Services('PostStatus', MonAResource, StatusName, 'Ok')
|
||||
Mona_Services('PostStatus', MonaResource, StatusName, 'Ok')
|
||||
Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$)
|
||||
end else
|
||||
Database_Services('ReleaseKeyIDLock', 'NICA_ORDERS', OrderId)
|
||||
ErrorMsg = 'Error encountered updating Nica order ':OrderId:' for reactor ':ReactNo:'.'
|
||||
Mona_Services('PostStatus', MonAResource, StatusName, 'Critical')
|
||||
Mona_Services('PostStatus', MonaResource, StatusName, 'Critical')
|
||||
end
|
||||
end
|
||||
end else
|
||||
@ -1124,7 +1128,6 @@ end service
|
||||
|
||||
Service UpdateNicaChecklistBaseInstructionIds()
|
||||
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_NICAINTEGRATIONSERVICE'
|
||||
StatusName = Service
|
||||
StatusState = 'OK'
|
||||
Machine = Environment_Services('GetServer')
|
||||
|
||||
@ -44,9 +44,11 @@ LoggingDTM = LogDate : ' ' : LogTime ; // Logging DTM
|
||||
|
||||
IsProd = Environment_Services('IsProd')
|
||||
If IsProd EQ True$ then
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_OBJPOSTLOG'
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_OBJPOSTLOG'
|
||||
MonaInboundResource = 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND'
|
||||
end else
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_OBJPOSTLOG'
|
||||
MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_OBJPOSTLOG'
|
||||
MonaInboundResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_INBOUND'
|
||||
end
|
||||
|
||||
ErrTitle = 'Error in Stored Procedure "obj_Post_Log"'
|
||||
@ -145,7 +147,7 @@ Post:
|
||||
RETURN
|
||||
END
|
||||
|
||||
If @RecCount EQ 0 then Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND', 'SetSAPBatchQueue', 'ok')
|
||||
If @RecCount EQ 0 then Mona_Services('PostStatus', MonaInboundResource, 'SetSAPBatchQueue', 'ok')
|
||||
Done = 0
|
||||
LOOP
|
||||
READNEXT PostLogKey USING CursorVar ELSE Done = 1
|
||||
@ -170,9 +172,9 @@ Post:
|
||||
If (Field(PostLogKey, '*', 2)) LT AllowedTime then
|
||||
Resp = Database_Services('UnlockKeyID', 'WO_MAT', PostLogRec<POST_LOG_REC_KEY1$>)
|
||||
If Resp NE False$ then
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND', 'SetSAPBatchQueue', 'ok')
|
||||
Mona_Services('PostStatus', MonaInboundResource, 'SetSAPBatchQueue', 'ok')
|
||||
end else
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND', 'SetSAPBatchQueue', 'critical')
|
||||
Mona_Services('PostStatus', MonaInboundResource, 'SetSAPBatchQueue', 'critical')
|
||||
LogData = ''
|
||||
LogData<1> = LoggingDTM
|
||||
LogData<2> = TableKey
|
||||
|
||||
@ -65,6 +65,15 @@ LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2]
|
||||
Headers = 'Logging DTM' : @FM : 'Notes'
|
||||
objSapInboundSftpLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, Comma$, Headers, '', False$, False$, True$)
|
||||
|
||||
IsProd = Environment_Services('IsProd')
|
||||
If IsProd EQ True$ then
|
||||
MonaInboundResource = 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND'
|
||||
MonaOutboundResource = 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND'
|
||||
end else
|
||||
MonaInboundResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_INBOUND'
|
||||
MonaOutboundResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_OUTBOUND'
|
||||
end
|
||||
|
||||
Main:
|
||||
|
||||
RepoID = ''
|
||||
@ -377,9 +386,9 @@ SendReconcile:
|
||||
SendToGroup = 'FI_SUPPORT'
|
||||
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
|
||||
obj_Notes('Create',Parms)
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND', 'SFTP-Interface-Outbound', 'critical')
|
||||
Mona_Services('PostStatus', 'MonaOutboundResource', 'SFTP-Interface-Outbound', 'critical')
|
||||
end else
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND', 'SFTP-Interface-Outbound', 'ok')
|
||||
Mona_Services('PostStatus', 'MonaOutboundResource', 'SFTP-Interface-Outbound', 'ok')
|
||||
end
|
||||
|
||||
StopTime = Time()
|
||||
@ -1108,9 +1117,9 @@ SendRecord:
|
||||
SendToGroup = 'FI_SUPPORT'
|
||||
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
|
||||
obj_Notes('Create',Parms)
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND', 'SFTP-Interface-Outbound', 'critical')
|
||||
Mona_Services('PostStatus', 'MonaOutboundResource', 'SFTP-Interface-Outbound', 'critical')
|
||||
end else
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND', 'SFTP-Interface-Outbound', 'ok')
|
||||
Mona_Services('PostStatus', 'MonaOutboundResource', 'SFTP-Interface-Outbound', 'ok')
|
||||
end
|
||||
|
||||
StopTime = Time()
|
||||
@ -1162,9 +1171,9 @@ ReadInbound:
|
||||
SendToGroup = 'FI_SUPPORT'
|
||||
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
|
||||
obj_Notes('Create',Parms)
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND', 'SFTP-Interface-Inbound', 'critical')
|
||||
Mona_Services('PostStatus', MonaInboundResource, 'SFTP-Interface-Inbound', 'critical')
|
||||
end else
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND', 'SFTP-Interface-Inbound', 'ok')
|
||||
Mona_Services('PostStatus', MonaInboundResource, 'SFTP-Interface-Inbound', 'ok')
|
||||
end
|
||||
|
||||
StopTime = Time()
|
||||
@ -1211,9 +1220,9 @@ ReadInbound:
|
||||
SendToGroup = 'FI_SUPPORT'
|
||||
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
|
||||
obj_Notes('Create',Parms)
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND', 'SFTP-Interface-Inbound', 'critical')
|
||||
Mona_Services('PostStatus', MonaInboundResource, 'SFTP-Interface-Inbound', 'critical')
|
||||
end else
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND', 'SFTP-Interface-Inbound', 'ok')
|
||||
Mona_Services('PostStatus', MonaInboundResource, 'SFTP-Interface-Inbound', 'ok')
|
||||
end
|
||||
|
||||
StopTime = Time()
|
||||
@ -1258,9 +1267,9 @@ ReadInbound:
|
||||
SendToGroup = 'FI_SUPPORT'
|
||||
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
|
||||
obj_Notes('Create',Parms)
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND', 'SFTP-Interface-Inbound', 'critical')
|
||||
Mona_Services('PostStatus', MonaInboundResource, 'SFTP-Interface-Inbound', 'critical')
|
||||
end else
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND', 'SFTP-Interface-Inbound', 'ok')
|
||||
Mona_Services('PostStatus', MonaInboundResource, 'SFTP-Interface-Inbound', 'ok')
|
||||
end
|
||||
|
||||
StopTime = Time()
|
||||
@ -1312,9 +1321,9 @@ ClearInbound:
|
||||
SendToGroup = 'FI_SUPPORT'
|
||||
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
|
||||
obj_Notes('Create',Parms)
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND', 'SFTP-Interface-Inbound', 'critical')
|
||||
Mona_Services('PostStatus', MonaInboundResource, 'SFTP-Interface-Inbound', 'critical')
|
||||
end else
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND', 'SFTP-Interface-Inbound', 'ok')
|
||||
Mona_Services('PostStatus', MonaInboundResource, 'SFTP-Interface-Inbound', 'ok')
|
||||
end
|
||||
|
||||
StopTime = Time()
|
||||
@ -1367,9 +1376,9 @@ DirNextSeq:
|
||||
SendToGroup = 'FI_SUPPORT'
|
||||
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
|
||||
obj_Notes('Create',Parms)
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND', 'SFTP-Interface-Outbound', 'critical')
|
||||
Mona_Services('PostStatus', 'MonaOutboundResource', 'SFTP-Interface-Outbound', 'critical')
|
||||
end else
|
||||
Mona_Services('PostStatus', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND', 'SFTP-Interface-Outbound', 'ok')
|
||||
Mona_Services('PostStatus', 'MonaOutboundResource', 'SFTP-Interface-Outbound', 'ok')
|
||||
end
|
||||
|
||||
StopTime = Time()
|
||||
|
||||
@ -72,6 +72,15 @@ Headers = 'Logging DTM' : @FM : 'WOMatKey' : @FM : 'Message'
|
||||
objLogPrintSpectrumLabel = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, Comma$, Headers, '', False$, False$)
|
||||
LoggingDTM = LogDate : ' ' : LogTime ; // Logging DTM
|
||||
|
||||
IsProd = Environment_Services('IsProd')
|
||||
If IsProd EQ True$ then
|
||||
MonaInboundResource = 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND'
|
||||
MonaOutboundResource = 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND'
|
||||
end else
|
||||
MonaInboundResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_INBOUND'
|
||||
MonaOutboundResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_SAP_OUTBOUND'
|
||||
end
|
||||
|
||||
GoToService else
|
||||
Error_Services('Set', Service : ' is not a valid service request within the ' : ServiceModule : ' services module.')
|
||||
end
|
||||
@ -303,7 +312,7 @@ Service SetInboundPending()
|
||||
InboundPending = RowCount - OutboundPending
|
||||
If InboundPending < 0 then InboundPending = 0
|
||||
Database_Services('WriteDataRow', 'APP_INFO', 'INBOUND_PENDING', InboundPending, True$)
|
||||
Mona_Services('SendMetric', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_INBOUND', 'InboundPending', InboundPending)
|
||||
Mona_Services('PostAverageMetric', MonaInboundResource, 'InboundPending', InboundPending)
|
||||
end
|
||||
ClearSelect 0
|
||||
Unlock hSysLists, ServiceKeyID else Null
|
||||
@ -421,7 +430,7 @@ Service SetOutboundPending()
|
||||
end
|
||||
Repeat
|
||||
Database_Services('WriteDataRow', 'APP_INFO', 'OUTBOUND_PENDING', OutboundPending, True$)
|
||||
Mona_Services('SendMetric', 'GRP_OPENINSIGHT_MES_OP_FE_SAP_OUTBOUND', 'OutboundPending', OutboundPending)
|
||||
Mona_Services('PostAverageMetric', MonaOutboundResource, 'OutboundPending', OutboundPending)
|
||||
end
|
||||
end
|
||||
ClearSelect 0
|
||||
|
||||
@ -88,11 +88,11 @@ API scan.POST
|
||||
If Error_Services('NoError') then
|
||||
StatusCode = 201
|
||||
GoSub CreateHALItem
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'OK')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'OK')
|
||||
end else
|
||||
Message = Error_Services('GetMessage')
|
||||
HTTP_Services('SetResponseStatus', 500, Message)
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'CRITICAL')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'CRITICAL')
|
||||
end
|
||||
|
||||
EndTick = GetTickCount()
|
||||
@ -131,15 +131,15 @@ API scan.ID.POST
|
||||
If Error_Services('NoError') then
|
||||
StatusCode = 200
|
||||
GoSub CreateHALItem
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'OK')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'OK')
|
||||
end else
|
||||
Message = Error_Services('GetMessage')
|
||||
HTTP_Services('SetResponseStatus', 400, Message)
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'CRITICAL')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'CRITICAL')
|
||||
end
|
||||
end else
|
||||
HTTP_Services('SetResponseStatus', 400, 'JSON object is missing from the request.')
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'WARNING')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'WARNING')
|
||||
end
|
||||
|
||||
EndTick = GetTickCount()
|
||||
@ -177,7 +177,7 @@ API scan.ID.GET
|
||||
ScanID = EndpointSegment
|
||||
StatusCode = 200
|
||||
GoSub CreateHALItem
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'OK')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'OK')
|
||||
|
||||
EndTick = GetTickCount()
|
||||
Mona_Services('QueueLatencyAndCountMetrics', MonaResource, MetricName, StartTick, EndTick)
|
||||
@ -213,20 +213,20 @@ API scan.ID.DELETE
|
||||
Database_Services('DeleteDataRow', 'SCANS', ScanID, True$, False$)
|
||||
If Error_Services('NoError') then
|
||||
HTTP_Services('SetResponseStatus', 200)
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'OK')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'OK')
|
||||
end else
|
||||
Message = Error_Services('GetMessage')
|
||||
HTTP_Services('SetResponseStatus', 500, Message)
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'CRITICAL')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'CRITICAL')
|
||||
end
|
||||
end else
|
||||
HTTP_Services('SetResponseStatus', 403, 'This scan is already accepted and cannot be deleted.')
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'OK')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'OK')
|
||||
end
|
||||
end else
|
||||
Message = Error_Services('GetMessage')
|
||||
HTTP_Services('SetResponseStatus', 404, Message)
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'WARNING')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'WARNING')
|
||||
end
|
||||
|
||||
EndTick = GetTickCount()
|
||||
@ -279,17 +279,17 @@ API scan.ID.PATCH
|
||||
If Error_Services('NoError') then
|
||||
StatusCode = 200
|
||||
GoSub CreateHALItem
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'OK')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'OK')
|
||||
end else
|
||||
Message = Error_Services('GetMessage')
|
||||
HTTP_Services('SetResponseStatus', 500, Message)
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'CRITICAL')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'CRITICAL')
|
||||
end
|
||||
|
||||
SRP_JSON(hBody, 'Release')
|
||||
end else
|
||||
HTTP_Services('SetResponseStatus', 400, 'JSON object is missing from the request.')
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'WARNING')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'WARNING')
|
||||
end
|
||||
end else
|
||||
ScanNotAcceptableReason = SRP_JSON(objResource, 'GetValue', 'scan.notAcceptableReason')
|
||||
@ -299,12 +299,12 @@ API scan.ID.PATCH
|
||||
end else
|
||||
Message = 'Unable to parse the JSON scan resource.'
|
||||
HTTP_Services('SetResponseStatus', 400, Message)
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'WARNING')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'WARNING')
|
||||
end
|
||||
end else
|
||||
Message = Error_Services('GetMessage')
|
||||
HTTP_Services('SetResponseStatus', 404, Message)
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'WARNING')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'WARNING')
|
||||
end
|
||||
|
||||
EndTick = GetTickCount()
|
||||
@ -372,20 +372,20 @@ API scan.ID.PUT
|
||||
Database_Services('WriteDataRow', 'SCANS', ScanID, ScanRow, True$, False$, True$)
|
||||
If Error_Services('NoError') then
|
||||
GoSub CreateHALItem
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'OK')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'OK')
|
||||
end else
|
||||
Message = Error_Services('GetMessage')
|
||||
HTTP_Services('SetResponseStatus', 500, Message)
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'CRITICAL')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'CRITICAL')
|
||||
end
|
||||
SRP_JSON(hBody, 'Release')
|
||||
end else
|
||||
HTTP_Services('SetResponseStatus', 400, 'Unable to parse the scanData JSON.')
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'WARNING')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'WARNING')
|
||||
end
|
||||
end else
|
||||
HTTP_Services('SetResponseStatus', 400, 'JSON object is missing from the request.')
|
||||
Mona_Services('SendStatus', MonaResource, MetricName, 'WARNING')
|
||||
Mona_Services('PostStatus', MonaResource, MetricName, 'WARNING')
|
||||
end
|
||||
|
||||
EndTick = GetTickCount()
|
||||
@ -437,3 +437,4 @@ CreateHALItem:
|
||||
return
|
||||
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user