From 71eb88c847160cbc4138f2442961b29c33dcccb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= Date: Wed, 16 Dec 2020 14:56:48 +0100 Subject: [PATCH] fix: this.timer merge conflict --- lib/db/client-instance-store.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/db/client-instance-store.js b/lib/db/client-instance-store.js index 409f72afb2..5512134e8b 100644 --- a/lib/db/client-instance-store.js +++ b/lib/db/client-instance-store.js @@ -31,7 +31,7 @@ class ClientInstanceStore { this.db = db; this.eventBus = eventBus; this.logger = getLogger('client-instance-store.js'); - this.timer = action => + this.metricTimer = action => metricsHelper.wrapTimer(eventBus, DB_TIME, { store: 'instance', action, @@ -72,7 +72,7 @@ class ClientInstanceStore { } async insert(details) { - const stopTimer = this.timer('insert'); + const stopTimer = this.metricTimer('insert'); const result = await this.db(TABLE) .count('*') @@ -94,7 +94,7 @@ class ClientInstanceStore { } async getAll() { - const stopTimer = this.timer('getAll'); + const stopTimer = this.metricTimer('getAll'); const rows = await this.db .select(COLUMNS)