feat: add more logging

Co-authored-by: Johan Nyman <[email protected]>

Author: jstarpl

packages/job-worker/src/ingest/commit.ts

@@ -179,7 +179,7 @@ export async function CommitIngestOperation(
 			await updateSegmentIdsForAdlibbedPartInstances(context, ingestModel, beforePartMap)
 
 			if (data.renamedSegments && data.renamedSegments.size > 0) {
-				logger.debug(`Renamed segments: ${JSON.stringify(Array.from(data.renamedSegments.entries()))}`)
+				logger.verbose(`Renamed segments: ${JSON.stringify(Array.from(data.renamedSegments.entries()))}`)
 			}
 			// ensure instances have matching segmentIds with the parts
 			await updatePartInstancesSegmentIds(context, ingestModel, data.renamedSegments, beforePartMap)
@@ -820,6 +820,7 @@ async function removeSegments(
 		})
 	}
 	for (const segmentId of purgeSegmentIds) {
+		logger.debug(`IngestModel: Removing segment "${segmentId}"`)
 		ingestModel.removeSegment(segmentId)
 	}
 }

packages/job-worker/src/ingest/mosDevice/diff.ts

@@ -11,6 +11,7 @@ import { IngestSegment } from '@sofie-automation/blueprints-integration'
 import { SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { CommitIngestData } from '../lock'
 import { IngestSegmentModel } from '../model/IngestSegmentModel'
+import { logger } from '../../logging'
 
 /**
  * Update the Ids of Segments based on new Ingest data
@@ -158,9 +159,11 @@ function applyExternalIdDiff(
 			}
 
 			// Remove the old Segment and it's contents, the new one will be generated shortly
+			logger.debug(`applyExternalIdDiff: Marking Segment for removing "${oldSegmentId}"`)
 			ingestModel.removeSegment(oldSegmentId)
 		} else {
 			// Perform the rename
+			logger.debug(`applyExternalIdDiff: Marking Segment for renaming "${oldSegmentId}" -> "${newSegmentId}"`)
 			ingestModel.changeSegmentId(oldSegmentId, newSegmentId)
 		}
 	}

packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts

@@ -751,12 +751,29 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 		if (this.rundownsImpl.find((rd) => rd.AdlibTestingSegmentHasChanged))
 			logOrThrowError(new Error(`Failed no changes in model assertion, an AdlibTesting Segment has been changed`))
 
-		if (
-			Array.from(this.allPartInstances.values()).find(
-				(part) => !part || part.partInstanceHasChanges || part.changedPieceInstanceIds().length > 0
-			)
+		const changedPartInstances = Array.from(this.allPartInstances.entries()).filter(
+			([_, partInstance]) =>
+				partInstance !== null && // null values mean a PartInstance was removed, which doesn't need to be tracked
+				(partInstance.partInstanceHasChanges || partInstance.changedPieceInstanceIds().length > 0)
 		)
-			logOrThrowError(new Error(`Failed no changes in model assertion, a PartInstance has been changed`))
+
+		if (changedPartInstances.length > 0) {
+			logOrThrowError(
+				new Error(
+					`Failed no changes in model assertion, PartInstances has been changed: ${JSON.stringify(
+						changedPartInstances.map(
+							([id, pi]) =>
+								`${id}: ` +
+								(!pi
+									? 'null'
+									: `partInstanceHasChanges: ${
+											pi.partInstanceHasChanges
+									  }, changedPieceInstanceIds: ${JSON.stringify(pi.changedPieceInstanceIds())}`)
+						)
+					)}`
+				)
+			)
+		}
 
 		if (span) span.end()
 	}

packages/job-worker/src/playout/setNext.ts

@@ -279,9 +279,11 @@ async function cleanupOrphanedItems(context: JobContext, playoutModel: PlayoutMo
 
 	const selectedPartInstancesSegmentIds = new Set<SegmentId>()
 
+	const previousPartInstance = playoutModel.previousPartInstance?.partInstance
 	const currentPartInstance = playoutModel.currentPartInstance?.partInstance
 	const nextPartInstance = playoutModel.nextPartInstance?.partInstance
 
+	if (previousPartInstance) selectedPartInstancesSegmentIds.add(previousPartInstance.segmentId)
 	if (currentPartInstance) selectedPartInstancesSegmentIds.add(currentPartInstance.segmentId)
 	if (nextPartInstance) selectedPartInstancesSegmentIds.add(nextPartInstance.segmentId)
 
@@ -291,7 +293,7 @@ async function cleanupOrphanedItems(context: JobContext, playoutModel: PlayoutMo
 
 	const alterSegmentsFromRundowns = new Map<RundownId, { deleted: SegmentId[]; hidden: SegmentId[] }>()
 	for (const segment of segments) {
-		// If the segment is orphaned and not the segment for the next or current partinstance
+		// If the segment is orphaned and not the segment for the previous, current or next partInstance
 		if (!selectedPartInstancesSegmentIds.has(segment.segment._id)) {
 			let rundownSegments = alterSegmentsFromRundowns.get(segment.segment.rundownId)
 			if (!rundownSegments) {