Skip to content

Commit 3d716c1

Browse files
authored
Merge pull request #36 from data-solution-automation-engine/34-create-sps-do-not-set-success-indicator
set SuccessIndicator on successful conclusion
2 parents bf28c64 + a4b4afa commit 3d716c1

9 files changed

+21
-1
lines changed

Direct_Framework/Stored Procedures/omd.CreateBatchInstance.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,17 @@ BEGIN TRY
168168

169169
FailureEndOfProcedure:
170170

171+
SET @SuccessIndicator = 'N'
172+
171173
SET @LogMessage = N'' + @SpName + ' ended in failure.';
172174
SET @MessageLog = [omd].[AddLogMessage]('ERROR', DEFAULT, DEFAULT, @LogMessage, @MessageLog)
173175

174176
GOTO EndOfProcedure
175177

176178
SuccessEndOfProcedure:
177179

180+
SET @SuccessIndicator = 'Y'
181+
178182
SET @LogMessage = N'' + @SpName + ' completed succesfully.';
179183
SET @MessageLog = [omd].[AddLogMessage]('SUCCESS', DEFAULT, DEFAULT, @LogMessage, @MessageLog)
180184

Direct_Framework/Stored Procedures/omd.CreateLoadWindow.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ WHERE modinst.EXECUTION_STATUS_CODE = ''Succeeded''';
229229
-- End of procedure label
230230
EndOfProcedure:
231231

232+
SET @SuccessIndicator = 'Y'
233+
232234
SET @EndTimestamp = SYSUTCDATETIME();
233235
SET @EndTimestampString = FORMAT(@EndTimestamp, 'yyyy-MM-dd HH:mm:ss.fffffff');
234236
SET @LogMessage = @EndTimestampString;

Direct_Framework/Stored Procedures/omd.CreateModuleInstance.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,17 @@ BEGIN TRY
223223

224224
FailureEndOfProcedure:
225225

226+
SET @SuccessIndicator = 'N'
227+
226228
SET @LogMessage = N'' + @SpName + ' ended in failure.';
227229
SET @MessageLog = [omd].[AddLogMessage]('ERROR', DEFAULT, DEFAULT, @LogMessage, @MessageLog)
228230

229231
GOTO EndOfProcedure
230232

231233
SuccessEndOfProcedure:
232234

235+
SET @SuccessIndicator = 'Y'
236+
233237
SET @LogMessage = N'' + @SpName + ' completed succesfully.';
234238
SET @MessageLog = [omd].[AddLogMessage]('SUCCESS', DEFAULT, DEFAULT, @LogMessage, @MessageLog)
235239

Direct_Framework/Stored Procedures/omd.EndDating.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ WHERE NOT EXISTS
192192
-- End of procedure label
193193
EndOfProcedure:
194194

195+
SET @SuccessIndicator = 'Y'
195196
SET @EndTimestamp = SYSUTCDATETIME();
196197
SET @EndTimestampString = FORMAT(@EndTimestamp, 'yyyy-MM-dd HH:mm:ss.fffffff');
197198
SET @LogMessage = @EndTimestampString;

Direct_Framework/Stored Procedures/omd.GetConsistencyTimestamp.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,8 @@ BEGIN TRY
398398
-- End of procedure label
399399
EndOfProcedure:
400400

401+
SET @SuccessIndicator = 'Y'
402+
401403
SET @EndTimestamp = SYSUTCDATETIME();
402404
SET @EndTimestampString = FORMAT(@EndTimestamp, 'yyyy-MM-dd HH:mm:ss.fffffff');
403405
SET @LogMessage = @EndTimestampString;

Direct_Framework/Stored Procedures/omd.InsertIntoEventLog.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ BEGIN TRY
129129
-- End of procedure label
130130
EndOfProcedure:
131131

132+
SET @SuccessIndicator = 'Y'
133+
132134
SET @EndTimestamp = SYSUTCDATETIME();
133135
SET @EndTimestampString = FORMAT(@EndTimestamp, 'yyyy-MM-dd HH:mm:ss.fffffff');
134136
SET @LogMessage = @EndTimestampString;

Direct_Framework/Stored Procedures/omd.ModuleEvaluation.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@ BEGIN TRY
464464

465465
ModuleFailure:
466466
-- 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.
467+
SET @SuccessIndicator = 'N'
467468
EXEC [omd].[UpdateModuleInstance]
468469
@ModuleInstanceId = @ModuleInstanceId,
469470
@Debug = @Debug,
@@ -483,6 +484,7 @@ BEGIN TRY
483484
-- End of procedure label
484485
EndOfProcedure:
485486

487+
SET @SuccessIndicator = 'Y'
486488
SET @EndTimestamp = SYSUTCDATETIME();
487489
SET @EndTimestampString = FORMAT(@EndTimestamp, 'yyyy-MM-dd HH:mm:ss.fffffff');
488490
SET @LogMessage = @EndTimestampString;

Direct_Framework/Stored Procedures/omd.RegisterBatch.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ BEGIN TRY
196196
-- End of procedure label
197197
EndOfProcedure:
198198

199+
SET @SuccessIndicator = 'Y'
200+
199201
SET @EndTimestamp = SYSUTCDATETIME();
200202
SET @EndTimestampString = FORMAT(@EndTimestamp, 'yyyy-MM-dd HH:mm:ss.fffffff');
201203
SET @LogMessage = @EndTimestampString;

Direct_Framework/Stored Procedures/omd.RunBatch.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,8 @@ BEGIN TRY
243243
@Debug = @Debug,
244244
@EventCode = 'Failure';
245245

246-
SET @Result = 'Failure';
246+
SET @Result = 'Failure';
247+
SET @SuccessIndicator = 'N';
247248

248249
THROW
249250

0 commit comments

Comments
 (0)