From b3d830617c611e5d19587beebc1fd907cb3355d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= <ivarconr@gmail.com>
Date: Thu, 22 Apr 2021 20:14:24 +0200
Subject: [PATCH] fix: skipLocked when updating lastSeen for toggles

---
 CHANGELOG.md                       | 4 ++++
 src/lib/db/feature-toggle-store.js | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71fb1dfb4e..2950a68b23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,10 @@
 - chore(deps): bump y18n from 4.0.0 to 4.0.1 (#775)
 - Feat: Api-Tokens (#774)
 
+## 3.17.5
+
+- fix: skipLocked when updating lastSeen for toggles
+
 ## 3.17.4
 
 - fix: version-checker must have instanceId
diff --git a/src/lib/db/feature-toggle-store.js b/src/lib/db/feature-toggle-store.js
index 8abc768da4..e14ea5449b 100644
--- a/src/lib/db/feature-toggle-store.js
+++ b/src/lib/db/feature-toggle-store.js
@@ -136,6 +136,8 @@ class FeatureToggleStore {
         try {
             await this.db(TABLE)
                 .whereIn('name', toggleNames)
+                .forUpdate()
+                .skipLocked()
                 .update({ last_seen_at: now });
         } catch (err) {
             this.logger.error('Could not update lastSeen, error: ', err);