Skip to content
Snippets Groups Projects
Commit 529a8469 authored by Angelina Filippova's avatar Angelina Filippova
Browse files

Add Logger tab, fix processing atom values

parent 5700f362
No related branches found
No related tags found
1 merge request!65Update server configuration
...@@ -71,7 +71,10 @@ const parseObject = object => { ...@@ -71,7 +71,10 @@ const parseObject = object => {
} }
const parseProxyUrl = value => { const parseProxyUrl = value => {
if (!Array.isArray(value) && typeof value === 'object' && value.tuple.length === 3 && value.tuple[0] === ':socks5') { if (value && !Array.isArray(value) &&
typeof value === 'object' &&
value.tuple.length === 3 &&
value.tuple[0] === ':socks5') {
const [, host, port] = value.tuple const [, host, port] = value.tuple
return { socks5: true, host, port } return { socks5: true, host, port }
} else if (typeof value === 'string') { } else if (typeof value === 'string') {
...@@ -83,7 +86,6 @@ const parseProxyUrl = value => { ...@@ -83,7 +86,6 @@ const parseProxyUrl = value => {
export const partialUpdate = (group, key) => { export const partialUpdate = (group, key) => {
if ((group === ':pleroma' && key === ':ecto_repos') || if ((group === ':pleroma' && key === ':ecto_repos') ||
(group === ':quack' && key === ':meta') ||
(group === ':mime' && key === ':types') || (group === ':mime' && key === ':types') ||
(group === ':auto_linker' && key === ':opts') || (group === ':auto_linker' && key === ':opts') ||
(group === ':swarm' && key === ':node_blacklist')) { (group === ':swarm' && key === ':node_blacklist')) {
...@@ -107,8 +109,13 @@ export const valueHasTuples = (key, value) => { ...@@ -107,8 +109,13 @@ export const valueHasTuples = (key, value) => {
export const wrapUpdatedSettings = (group, settings) => { export const wrapUpdatedSettings = (group, settings) => {
return Object.keys(settings).map((key) => { return Object.keys(settings).map((key) => {
const value = settings[key]._value ? settings[key]._value[1] : wrapValues(settings[key]) if (settings[key]._value) {
return { group, key, value } const value = settings[key]._value[0] === 'atom' && settings[key]._value[1].length > 1
? `:${settings[key]._value[1]}`
: settings[key]._value[1]
return { group, key, value }
}
return { group, key, value: wrapValues(settings[key]) }
}) })
} }
...@@ -117,7 +124,7 @@ const wrapValues = settings => { ...@@ -117,7 +124,7 @@ const wrapValues = settings => {
const [type, value] = Array.isArray(settings[setting]) ? settings[setting] : ['', settings[setting]] const [type, value] = Array.isArray(settings[setting]) ? settings[setting] : ['', settings[setting]]
if (type === 'keyword' || type.includes('keyword')) { if (type === 'keyword' || type.includes('keyword')) {
return { 'tuple': [setting, wrapValues(value)] } return { 'tuple': [setting, wrapValues(value)] }
} else if (type === 'atom') { } else if (type === 'atom' && value.length > 0) {
return { 'tuple': [setting, `:${value}`] } return { 'tuple': [setting, `:${value}`] }
} else if (type.includes('tuple') && Array.isArray(value)) { } else if (type.includes('tuple') && Array.isArray(value)) {
return { 'tuple': [setting, { 'tuple': value }] } return { 'tuple': [setting, { 'tuple': value }] }
......
...@@ -185,7 +185,9 @@ export default { ...@@ -185,7 +185,9 @@ export default {
inputValue() { inputValue() {
if ([':esshd', ':cors_plug', ':quack', ':http_signatures'].includes(this.settingGroup.group) && if ([':esshd', ':cors_plug', ':quack', ':http_signatures'].includes(this.settingGroup.group) &&
this.data[this.setting.key]) { this.data[this.setting.key]) {
return this.data[this.setting.key].value return this.setting.type === 'atom' && this.data[this.setting.key].value[0] === ':'
? this.data[this.setting.key].value.substr(1)
: this.data[this.setting.key].value
} else if ((this.settingGroup.group === ':logger' && this.setting.key === ':backends') || } else if ((this.settingGroup.group === ':logger' && this.setting.key === ':backends') ||
this.setting.key === 'Pleroma.Web.Auth.Authenticator' || this.setting.key === 'Pleroma.Web.Auth.Authenticator' ||
this.setting.key === ':admin_token') { this.setting.key === ':admin_token') {
......
...@@ -38,13 +38,14 @@ ...@@ -38,13 +38,14 @@
<el-tab-pane :label="$t('settings.instance')" name="instance"> <el-tab-pane :label="$t('settings.instance')" name="instance">
<instance/> <instance/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('settings.logger')" lazy>
<logger/>
</el-tab-pane>
<!-- <!--
<el-tab-pane :label="$t('settings.jobQueue')" lazy> <el-tab-pane :label="$t('settings.jobQueue')" lazy>
<job-queue/> <job-queue/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('settings.logger')" lazy>
<logger/>
</el-tab-pane>
<el-tab-pane :label="$t('settings.mailer')" lazy> <el-tab-pane :label="$t('settings.mailer')" lazy>
<mailer/> <mailer/>
</el-tab-pane> </el-tab-pane>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment