diff --git a/src/backend/scrobblers/AbstractScrobbleClient.ts b/src/backend/scrobblers/AbstractScrobbleClient.ts index 0558bdaf..742c0e0b 100644 --- a/src/backend/scrobblers/AbstractScrobbleClient.ts +++ b/src/backend/scrobblers/AbstractScrobbleClient.ts @@ -1089,7 +1089,6 @@ export default abstract class AbstractScrobbleClient extends AbstractComponent i if(res.queue.retries > 0) { this.deadLetterGauge.labels(this.getPrometheusLabels()).dec(); this.deadLetterLength -= 1; - this.deadLetterQueued -= 1; this.emitEvent('removeDeadLetter', { dead: { id: res.playEntity.uid } }); } queueStates = res.playEntity.queueStates.filter(x => x.queueName !== res.queue.queueName) @@ -1378,6 +1377,7 @@ export default abstract class AbstractScrobbleClient extends AbstractComponent i this.deadLetterLength -= 1; if(queueState.queueStatus === 'queued') { + this.emitEvent('deadLetterDequeued', { dead: { id: dead.uid } }); this.deadLetterQueued -= 1; } this.deadLetterGauge.labels(this.getPrometheusLabels()).dec(); diff --git a/src/backend/sources/AbstractSource.ts b/src/backend/sources/AbstractSource.ts index cdd1619f..7bf3e3d4 100644 --- a/src/backend/sources/AbstractSource.ts +++ b/src/backend/sources/AbstractSource.ts @@ -1125,7 +1125,6 @@ export default abstract class AbstractSource extends AbstractComponent implement if(res.queue.retries > 0) { this.deadLetterGauge.labels(this.getPrometheusLabels()).dec(); this.deadLetterLength -= 1; - this.deadLetterQueued -= 1; this.emitEvent('removeDeadLetter', { dead: { id: res.playEntity.uid } }); } queueStates = res.playEntity.queueStates.filter(x => x.queueName !== res.queue.queueName); @@ -1298,6 +1297,7 @@ export default abstract class AbstractSource extends AbstractComponent implement this.deadLetterLength -= 1; if(queueState.queueStatus === 'queued') { this.deadLetterQueued -= 1; + this.emitEvent('deadLetterDequeued', { dead: { id: dead.uid } }); } this.deadLetterGauge.labels(this.getPrometheusLabels()).dec(); this.emitEvent('removeDeadLetter', { dead: { id: dead.uid } }); diff --git a/src/client/components/msComponent/Stats.tsx b/src/client/components/msComponent/Stats.tsx index 90075066..9fd300ff 100644 --- a/src/client/components/msComponent/Stats.tsx +++ b/src/client/components/msComponent/Stats.tsx @@ -168,7 +168,7 @@ export const DeadLetterIndicatorStreamable = (props: { data: Pick