Skip to content

Commit

Permalink
chore: reduce logging
Browse files Browse the repository at this point in the history
  • Loading branch information
cameri committed Dec 24, 2022
1 parent 0083865 commit 8f2416e
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 16 deletions.
1 change: 0 additions & 1 deletion src/app/worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export class AppWorker implements IRunnable {
}

private onMessage(message: { eventName: string, event: unknown }): void {
debug('broadcast message received: %o', message)
this.adapter.emit(message.eventName, message.event)
}

Expand Down
3 changes: 1 addition & 2 deletions src/handlers/delegated-event-message-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ const debug = createLogger('delegated-event-message-handler')

export class DelegatedEventMessageHandler extends EventMessageHandler implements IMessageHandler {
public async handleMessage(message: IncomingEventMessage): Promise<void> {
debug('received message: %o', message)
const [, event] = message

let reason = await this.isEventValid(event)
Expand Down Expand Up @@ -51,7 +50,7 @@ export class DelegatedEventMessageHandler extends EventMessageHandler implements
try {
await strategy.execute(delegatedEvent)
} catch (error) {
debug('error handling message %o: %o', message, error)
console.error('error handling message', message, error)
this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, false, 'error: unable to process event'))
}
}
Expand Down
5 changes: 2 additions & 3 deletions src/handlers/event-message-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ export class EventMessageHandler implements IMessageHandler {
protected readonly strategyFactory: Factory<IEventStrategy<Event, Promise<void>>, [Event, IWebSocketAdapter]>,
private readonly settings: () => ISettings,
private readonly slidingWindowRateLimiter: Factory<IRateLimiter>,
) { }
) {}

public async handleMessage(message: IncomingEventMessage): Promise<void> {
debug('received message: %o', message)
const [, event] = message

let reason = await this.isEventValid(event)
Expand Down Expand Up @@ -55,7 +54,7 @@ export class EventMessageHandler implements IMessageHandler {
try {
await strategy.execute(event)
} catch (error) {
debug('error handling message %o: %o', message, error)
console.error('error handling message', message, error)
this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, false, 'error: unable to process event'))
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/handlers/event-strategies/delete-event-strategy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export class DeleteEventStrategy implements IEventStrategy<Event, Promise<void>>
) { }

public async execute(event: Event): Promise<void> {
debug('received event: %o', event)
debug('received delete event: %o', event)
const count = await this.eventRepository.create(event)
this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, true, (count) ? '' : 'duplicate:'))

Expand Down
2 changes: 1 addition & 1 deletion src/handlers/event-strategies/ephemeral-event-strategy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export class EphemeralEventStrategy implements IEventStrategy<Event, Promise<voi
) { }

public async execute(event: Event): Promise<void> {
debug('received event: %o', event)
debug('received ephemeral event: %o', event)
this.webSocket.emit(WebSocketAdapterEvent.Broadcast, event)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class ParameterizedReplaceableEventStrategy
) { }

public async execute(event: Event): Promise<void> {
debug('received event: %o', event)
debug('received parameterized replaceable event: %o', event)

const [, ...deduplication] = event.tags.find((tag) => tag.length >= 2 && tag[0] === EventTags.Deduplication) ?? [null, '']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class ReplaceableEventStrategy implements IEventStrategy<Event, Promise<v
) { }

public async execute(event: Event): Promise<void> {
debug('received event: %o', event)
debug('received replaceable event: %o', event)
const count = await this.eventRepository.upsert(event)
this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, true, (count) ? '' : 'duplicate:'))
if (count) {
Expand Down
3 changes: 1 addition & 2 deletions src/handlers/subscribe-message-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ export class SubscribeMessageHandler implements IMessageHandler, IAbortable {
}

public async handleMessage(message: SubscribeMessage): Promise<void> {
debug('received message: %o', message)
const subscriptionId = message[1]
const filters = uniqWith(equals, message.slice(2)) as SubscriptionFilter[]

Expand All @@ -49,7 +48,7 @@ export class SubscribeMessageHandler implements IMessageHandler, IAbortable {
}

private async fetchAndSend(subscriptionId: string, filters: SubscriptionFilter[]): Promise<void> {
debug('fetching events for subscription %s with %o', subscriptionId, filters)
debug('fetching events for subscription %s with filters %o', subscriptionId, filters)
const sendEvent = (event: Event) =>
this.webSocket.emit(WebSocketAdapterEvent.Message, createOutgoingEventMessage(subscriptionId, event))
const sendEOSE = () =>
Expand Down
4 changes: 0 additions & 4 deletions src/handlers/unsubscribe-message-handler.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
import { createLogger } from '../factories/logger-factory'
import { IMessageHandler } from '../@types/message-handlers'
import { IWebSocketAdapter } from '../@types/adapters'
import { UnsubscribeMessage } from '../@types/messages'
import { WebSocketAdapterEvent } from '../constants/adapter'

const debug = createLogger('unsubscribe-message-handler')

export class UnsubscribeMessageHandler implements IMessageHandler {
public constructor(
private readonly webSocket: IWebSocketAdapter,
) { }

public async handleMessage(message: UnsubscribeMessage): Promise<void> {
debug('received message: %o', message)
this.webSocket.emit(WebSocketAdapterEvent.Unsubscribe, message[1])
}
}

0 comments on commit 8f2416e

Please sign in to comment.