diff --git a/Direct_Framework/Stored Procedures/omd.CreateBatchInstance.sql b/Direct_Framework/Stored Procedures/omd.CreateBatchInstance.sql index 5d05a98..c6dce94 100644 --- a/Direct_Framework/Stored Procedures/omd.CreateBatchInstance.sql +++ b/Direct_Framework/Stored Procedures/omd.CreateBatchInstance.sql @@ -168,6 +168,8 @@ BEGIN TRY FailureEndOfProcedure: + SET @SuccessIndicator = 'N' + SET @LogMessage = N'' + @SpName + ' ended in failure.'; SET @MessageLog = [omd].[AddLogMessage]('ERROR', DEFAULT, DEFAULT, @LogMessage, @MessageLog) @@ -175,6 +177,8 @@ BEGIN TRY SuccessEndOfProcedure: + SET @SuccessIndicator = 'Y' + SET @LogMessage = N'' + @SpName + ' completed succesfully.'; SET @MessageLog = [omd].[AddLogMessage]('SUCCESS', DEFAULT, DEFAULT, @LogMessage, @MessageLog) diff --git a/Direct_Framework/Stored Procedures/omd.CreateLoadWindow.sql b/Direct_Framework/Stored Procedures/omd.CreateLoadWindow.sql index 0fdd3ed..8ab2b4e 100644 --- a/Direct_Framework/Stored Procedures/omd.CreateLoadWindow.sql +++ b/Direct_Framework/Stored Procedures/omd.CreateLoadWindow.sql @@ -229,6 +229,8 @@ WHERE modinst.EXECUTION_STATUS_CODE = ''Succeeded'''; -- End of procedure label EndOfProcedure: + SET @SuccessIndicator = 'Y' + SET @EndTimestamp = SYSUTCDATETIME(); SET @EndTimestampString = FORMAT(@EndTimestamp, 'yyyy-MM-dd HH:mm:ss.fffffff'); SET @LogMessage = @EndTimestampString; diff --git a/Direct_Framework/Stored Procedures/omd.CreateModuleInstance.sql b/Direct_Framework/Stored Procedures/omd.CreateModuleInstance.sql index aff30a5..81a1f18 100644 --- a/Direct_Framework/Stored Procedures/omd.CreateModuleInstance.sql +++ b/Direct_Framework/Stored Procedures/omd.CreateModuleInstance.sql @@ -223,6 +223,8 @@ BEGIN TRY FailureEndOfProcedure: + SET @SuccessIndicator = 'N' + SET @LogMessage = N'' + @SpName + ' ended in failure.'; SET @MessageLog = [omd].[AddLogMessage]('ERROR', DEFAULT, DEFAULT, @LogMessage, @MessageLog) @@ -230,6 +232,8 @@ BEGIN TRY SuccessEndOfProcedure: + SET @SuccessIndicator = 'Y' + SET @LogMessage = N'' + @SpName + ' completed succesfully.'; SET @MessageLog = [omd].[AddLogMessage]('SUCCESS', DEFAULT, DEFAULT, @LogMessage, @MessageLog) diff --git a/Direct_Framework/Stored Procedures/omd.EndDating.sql b/Direct_Framework/Stored Procedures/omd.EndDating.sql index 3327e81..ef3f3fe 100644 --- a/Direct_Framework/Stored Procedures/omd.EndDating.sql +++ b/Direct_Framework/Stored Procedures/omd.EndDating.sql @@ -192,6 +192,7 @@ WHERE NOT EXISTS -- End of procedure label EndOfProcedure: + SET @SuccessIndicator = 'Y' SET @EndTimestamp = SYSUTCDATETIME(); SET @EndTimestampString = FORMAT(@EndTimestamp, 'yyyy-MM-dd HH:mm:ss.fffffff'); SET @LogMessage = @EndTimestampString; diff --git a/Direct_Framework/Stored Procedures/omd.GetConsistencyTimestamp.sql b/Direct_Framework/Stored Procedures/omd.GetConsistencyTimestamp.sql index b355d50..a7ff0de 100644 --- a/Direct_Framework/Stored Procedures/omd.GetConsistencyTimestamp.sql +++ b/Direct_Framework/Stored Procedures/omd.GetConsistencyTimestamp.sql @@ -398,6 +398,8 @@ BEGIN TRY -- End of procedure label EndOfProcedure: + SET @SuccessIndicator = 'Y' + SET @EndTimestamp = SYSUTCDATETIME(); SET @EndTimestampString = FORMAT(@EndTimestamp, 'yyyy-MM-dd HH:mm:ss.fffffff'); SET @LogMessage = @EndTimestampString; diff --git a/Direct_Framework/Stored Procedures/omd.InsertIntoEventLog.sql b/Direct_Framework/Stored Procedures/omd.InsertIntoEventLog.sql index 1817a6a..5490fe7 100644 --- a/Direct_Framework/Stored Procedures/omd.InsertIntoEventLog.sql +++ b/Direct_Framework/Stored Procedures/omd.InsertIntoEventLog.sql @@ -129,6 +129,8 @@ BEGIN TRY -- End of procedure label EndOfProcedure: + SET @SuccessIndicator = 'Y' + SET @EndTimestamp = SYSUTCDATETIME(); SET @EndTimestampString = FORMAT(@EndTimestamp, 'yyyy-MM-dd HH:mm:ss.fffffff'); SET @LogMessage = @EndTimestampString; diff --git a/Direct_Framework/Stored Procedures/omd.ModuleEvaluation.sql b/Direct_Framework/Stored Procedures/omd.ModuleEvaluation.sql index 72ab29f..26cb384 100644 --- a/Direct_Framework/Stored Procedures/omd.ModuleEvaluation.sql +++ b/Direct_Framework/Stored Procedures/omd.ModuleEvaluation.sql @@ -464,6 +464,7 @@ BEGIN TRY ModuleFailure: -- The procedure should not be able to end in this part, so this is just to be sure there is a failure reported when this happens. + SET @SuccessIndicator = 'N' EXEC [omd].[UpdateModuleInstance] @ModuleInstanceId = @ModuleInstanceId, @Debug = @Debug, @@ -483,6 +484,7 @@ BEGIN TRY -- End of procedure label EndOfProcedure: + SET @SuccessIndicator = 'Y' SET @EndTimestamp = SYSUTCDATETIME(); SET @EndTimestampString = FORMAT(@EndTimestamp, 'yyyy-MM-dd HH:mm:ss.fffffff'); SET @LogMessage = @EndTimestampString; diff --git a/Direct_Framework/Stored Procedures/omd.RegisterBatch.sql b/Direct_Framework/Stored Procedures/omd.RegisterBatch.sql index 156bfbc..11bd20e 100644 --- a/Direct_Framework/Stored Procedures/omd.RegisterBatch.sql +++ b/Direct_Framework/Stored Procedures/omd.RegisterBatch.sql @@ -196,6 +196,8 @@ BEGIN TRY -- End of procedure label EndOfProcedure: + SET @SuccessIndicator = 'Y' + SET @EndTimestamp = SYSUTCDATETIME(); SET @EndTimestampString = FORMAT(@EndTimestamp, 'yyyy-MM-dd HH:mm:ss.fffffff'); SET @LogMessage = @EndTimestampString; diff --git a/Direct_Framework/Stored Procedures/omd.RunBatch.sql b/Direct_Framework/Stored Procedures/omd.RunBatch.sql index 978c70c..8e639e9 100644 --- a/Direct_Framework/Stored Procedures/omd.RunBatch.sql +++ b/Direct_Framework/Stored Procedures/omd.RunBatch.sql @@ -243,7 +243,8 @@ BEGIN TRY @Debug = @Debug, @EventCode = 'Failure'; - SET @Result = 'Failure'; + SET @Result = 'Failure'; + SET @SuccessIndicator = 'N'; THROW