diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasBrushLine.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasBrushLine.ts index d81a413f83..5b8df77e8d 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasBrushLine.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasBrushLine.ts @@ -30,7 +30,7 @@ export class CanvasBrushLine { this.parent = parent; this.manager = parent.manager; - this.getLoggingContext = this.manager.buildObjectGetLoggingContext(this); + this.getLoggingContext = this.manager.buildGetLoggingContext(this); this.log = this.manager.buildLogger(this.getLoggingContext); this.log.trace({ state }, 'Creating brush line'); diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasEraserLine.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasEraserLine.ts index cf54722bf1..fabaf77e70 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasEraserLine.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasEraserLine.ts @@ -29,7 +29,7 @@ export class CanvasEraserLine { this.id = id; this.parent = parent; this.manager = parent.manager; - this.getLoggingContext = this.manager.buildObjectGetLoggingContext(this); + this.getLoggingContext = this.manager.buildGetLoggingContext(this); this.log = this.manager.buildLogger(this.getLoggingContext); this.log.trace({ state }, 'Creating eraser line'); diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasImage.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasImage.ts index 8e69b7b41d..c3b33a3878 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasImage.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasImage.ts @@ -39,7 +39,7 @@ export class CanvasImage { this.id = id; this.parent = parent; this.manager = parent.manager; - this.getLoggingContext = this.manager.buildObjectGetLoggingContext(this); + this.getLoggingContext = this.manager.buildGetLoggingContext(this); this.log = this.manager.buildLogger(this.getLoggingContext); this.log.trace({ state }, 'Creating image'); diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayer.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayer.ts index 4892df4df8..62977aaf9c 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayer.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayer.ts @@ -60,7 +60,7 @@ export class CanvasLayer { constructor(state: LayerEntity, manager: CanvasManager) { this.id = state.id; this.manager = manager; - this.getLoggingContext = this.manager.buildEntityGetLoggingContext(this); + this.getLoggingContext = this.manager.buildGetLoggingContext(this); this.log = this.manager.buildLogger(this.getLoggingContext); this.log.debug({ state }, 'Creating layer'); diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasManager.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasManager.ts index 69e69b161a..177236b88a 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasManager.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasManager.ts @@ -591,26 +591,33 @@ export class CanvasManager { }); } - buildObjectGetLoggingContext = ( - instance: CanvasBrushLine | CanvasEraserLine | CanvasRect | CanvasImage | CanvasTransformer + buildGetLoggingContext = ( + instance: + | CanvasBrushLine + | CanvasEraserLine + | CanvasRect + | CanvasImage + | CanvasTransformer + | CanvasLayer + | CanvasStagingArea ): GetLoggingContext => { - return (extra?: JSONObject): JSONObject => { - return { - ...instance.parent.getLoggingContext(), - objectId: instance.id, - ...extra, + if (instance instanceof CanvasLayer || instance instanceof CanvasStagingArea) { + return (extra?: JSONObject): JSONObject => { + return { + ...instance.manager.getLoggingContext(), + entityId: instance.id, + ...extra, + }; }; - }; - }; - - buildEntityGetLoggingContext = (instance: CanvasLayer | CanvasStagingArea): GetLoggingContext => { - return (extra?: JSONObject): JSONObject => { - return { - ...instance.manager.getLoggingContext(), - entityId: instance.id, - ...extra, + } else { + return (extra?: JSONObject): JSONObject => { + return { + ...instance.parent.getLoggingContext(), + objectId: instance.id, + ...extra, + }; }; - }; + } }; logDebugInfo() { diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasRect.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasRect.ts index a0453048be..101a64b923 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasRect.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasRect.ts @@ -28,7 +28,7 @@ export class CanvasRect { this.id = id; this.parent = parent; this.manager = parent.manager; - this.getLoggingContext = this.manager.buildObjectGetLoggingContext(this); + this.getLoggingContext = this.manager.buildGetLoggingContext(this); this.log = this.manager.buildLogger(this.getLoggingContext); this.log.trace({ state }, 'Creating rect'); diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasStagingArea.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasStagingArea.ts index 278e3dbfc0..b881b5f7f9 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasStagingArea.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasStagingArea.ts @@ -22,7 +22,7 @@ export class CanvasStagingArea { constructor(manager: CanvasManager) { this.id = getPrefixedId(CanvasStagingArea.TYPE); this.manager = manager; - this.getLoggingContext = this.manager.buildEntityGetLoggingContext(this); + this.getLoggingContext = this.manager.buildGetLoggingContext(this); this.log = this.manager.buildLogger(this.getLoggingContext); this.log.debug('Creating staging area'); diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasTransformer.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasTransformer.ts index 68ceaf0037..303f60ecd2 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasTransformer.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasTransformer.ts @@ -63,7 +63,7 @@ export class CanvasTransformer { this.manager = parent.manager; this.transformTarget = transformTarget; - this.getLoggingContext = this.manager.buildObjectGetLoggingContext(this); + this.getLoggingContext = this.manager.buildGetLoggingContext(this); this.log = this.manager.buildLogger(this.getLoggingContext); this.subscriptions = [];