From 55c241263a44ef89036fdd8652544af4397543d1 Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 18 Aug 2023 11:32:51 +0200 Subject: [PATCH] clean merge mess --- src/lavinmq/http/controller/nodes.cr | 6 ------ src/lavinmq/replication/server.cr | 12 ++++++++++++ static/js/nodes.js | 12 ------------ 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/lavinmq/http/controller/nodes.cr b/src/lavinmq/http/controller/nodes.cr index 52d426c7eb..dc7e85206f 100644 --- a/src/lavinmq/http/controller/nodes.cr +++ b/src/lavinmq/http/controller/nodes.cr @@ -108,12 +108,6 @@ module LavinMQ end context end - - put "/api/nodes" do |context, params| - settings = parse_body(context) - @amqp_server.update_replicator_settings(settings) - context - end end APPLICATIONS = [{ diff --git a/src/lavinmq/replication/server.cr b/src/lavinmq/replication/server.cr index 857f656efe..b546dcef80 100644 --- a/src/lavinmq/replication/server.cr +++ b/src/lavinmq/replication/server.cr @@ -102,8 +102,20 @@ module LavinMQ end end + def has_min_followers? + @followers.size >= @min_followers + end + getter min_followers + def has_max_lag? + @followers.all? do |f| + f.lag <= @max_lag + end + end + + getter max_lag + private def password : String path = File.join(Config.instance.data_dir, ".replication_secret") begin diff --git a/static/js/nodes.js b/static/js/nodes.js index a4909040d2..0cc3eeb065 100644 --- a/static/js/nodes.js +++ b/static/js/nodes.js @@ -215,18 +215,6 @@ const followersTable = Table.renderTable('followers', followersTableOpts, (tr, i Table.renderCell(tr, 3, humanizeBytes(item.sent_bytes - item.acked_bytes), 'right') }) -document.querySelector('#followerSettings').addEventListener('submit', function (evt) { - // evt.preventDefault() - const data = new window.FormData(this) - console.log(data.get('minFollowers')) - const body = { - minFollowers: parseInt(data.get('minFollowers')), - maxLag: parseInt(data.get('maxLag')) - } - HTTP.request('PUT', url, { body }) - .then(minFollowers => {}).catch(HTTP.alertErrorHandler) -}) - function updateCharts (response) { if(response[0].mem_used !== undefined) { const memoryStats = {