From 198ac3e035a6ed0b7866c224d8a3b5c6c3d9df76 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 31 Jul 2020 19:44:39 +0300
Subject: [PATCH] Add Pools, Connections pools and Hackney pools settings on
Job Queue tab
---
src/views/settings/components/JobQueue.vue | 30 ++++++++++++++++++++++
src/views/settings/components/tabs.js | 2 +-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/src/views/settings/components/JobQueue.vue b/src/views/settings/components/JobQueue.vue
index a2c03349..63554eea 100644
--- a/src/views/settings/components/JobQueue.vue
+++ b/src/views/settings/components/JobQueue.vue
@@ -11,6 +11,18 @@
<el-form :model="activityExpirationData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="activityExpiration" :data="activityExpirationData"/>
</el-form>
+ <el-divider v-if="activityExpiration" class="divider thick-line"/>
+ <el-form :model="connectionsPoolsData" :label-position="labelPosition" :label-width="labelWidth">
+ <setting :setting-group="connectionsPools" :data="connectionsPoolsData"/>
+ </el-form>
+ <el-divider v-if="connectionsPools" class="divider thick-line"/>
+ <el-form :model="poolsData" :label-position="labelPosition" :label-width="labelWidth">
+ <setting :setting-group="pools" :data="poolsData"/>
+ </el-form>
+ <el-divider v-if="pools" class="divider thick-line"/>
+ <el-form :model="hackneyPoolsData" :label-position="labelPosition" :label-width="labelWidth">
+ <setting :setting-group="hackneyPools" :data="hackneyPoolsData"/>
+ </el-form>
<div class="submit-button-container">
<el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button>
</div>
@@ -36,6 +48,18 @@ export default {
activityExpirationData() {
return _.get(this.settings.settings, [':pleroma', 'Pleroma.ActivityExpiration']) || {}
},
+ connectionsPools() {
+ return this.settings.description.find(setting => setting.key === ':connections_pool')
+ },
+ connectionsPoolsData() {
+ return _.get(this.settings.settings, [':pleroma', ':connections_pool']) || {}
+ },
+ hackneyPools() {
+ return this.settings.description.find(setting => setting.key === ':hackney_pools')
+ },
+ hackneyPoolsData() {
+ return _.get(this.settings.settings, [':pleroma', ':hackney_pools']) || {}
+ },
isMobile() {
return this.$store.state.app.device === 'mobile'
},
@@ -66,6 +90,12 @@ export default {
obanQueuesData() {
return _.get(this.settings.settings, [':pleroma', 'Oban']) || {}
},
+ pools() {
+ return this.settings.description.find(setting => setting.key === ':pools')
+ },
+ poolsData() {
+ return _.get(this.settings.settings, [':pleroma', ':pools']) || {}
+ },
workers() {
return this.settings.description.find(setting => setting.key === ':workers')
},
diff --git a/src/views/settings/components/tabs.js b/src/views/settings/components/tabs.js
index e7ff10c7..d58b2d1a 100644
--- a/src/views/settings/components/tabs.js
+++ b/src/views/settings/components/tabs.js
@@ -34,7 +34,7 @@ export const tabs = description => {
},
'job-queue': {
label: 'settings.jobQueue',
- settings: ['Pleroma.ActivityExpiration', 'Oban', ':workers']
+ settings: ['Pleroma.ActivityExpiration', ':connections_pool', ':hackney_pools', 'Oban', ':pools', ':workers']
},
'link-formatter': {
label: 'settings.linkFormatter',
--
GitLab