chore: format with Prettier

This commit is contained in:
Julien Fontanet 2022-08-23 11:56:26 +02:00
parent ae373c3e77
commit 74d15e1a92
8 changed files with 17 additions and 12 deletions

View File

@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: '' title: ''
labels: '' labels: ''
assignees: '' assignees: ''
--- ---
**Is your feature request related to a problem? Please describe.** **Is your feature request related to a problem? Please describe.**

View File

@ -245,7 +245,7 @@ exports.Backup = class Backup {
}) })
) )
), ),
() => settings.healthCheckSr !== undefined ? this._getRecord('SR', settings.healthCheckSr) : undefined, () => (settings.healthCheckSr !== undefined ? this._getRecord('SR', settings.healthCheckSr) : undefined),
async (srs, remoteAdapters, healthCheckSr) => { async (srs, remoteAdapters, healthCheckSr) => {
// remove adapters that failed (already handled) // remove adapters that failed (already handled)
remoteAdapters = remoteAdapters.filter(_ => _ !== undefined) remoteAdapters = remoteAdapters.filter(_ => _ !== undefined)

View File

@ -160,7 +160,7 @@ test('it remove backup meta data referencing a missing vhd in delta backup', asy
const logInfo = message => { const logInfo = message => {
loggued += message + '\n' loggued += message + '\n'
} }
await adapter.cleanVm('/', { remove: true, logInfo, logWarn: logInfo , lock: false}) await adapter.cleanVm('/', { remove: true, logInfo, logWarn: logInfo, lock: false })
let matched = loggued.match(/deleting unused VHD/g) || [] let matched = loggued.match(/deleting unused VHD/g) || []
expect(matched.length).toEqual(1) // only one vhd should have been deleted expect(matched.length).toEqual(1) // only one vhd should have been deleted
@ -179,7 +179,7 @@ test('it remove backup meta data referencing a missing vhd in delta backup', asy
{ flags: 'w' } { flags: 'w' }
) )
loggued = '' loggued = ''
await adapter.cleanVm('/', { remove: true, logInfo, logWarn: () => {} , lock: false}) await adapter.cleanVm('/', { remove: true, logInfo, logWarn: () => {}, lock: false })
matched = loggued.match(/deleting unused VHD/g) || [] matched = loggued.match(/deleting unused VHD/g) || []
expect(matched.length).toEqual(2) // all vhds (orphan and child ) should have been deleted expect(matched.length).toEqual(2) // all vhds (orphan and child ) should have been deleted
}) })
@ -271,7 +271,7 @@ test('it finish unterminated merge ', async () => {
}) })
) )
await adapter.cleanVm('/', { remove: true, merge: true, logWarn: ()=>{}, lock: false}) await adapter.cleanVm('/', { remove: true, merge: true, logWarn: () => {}, lock: false })
// merging is already tested in vhd-lib, don't retest it here (and theses vhd are as empty as my stomach at 12h12) // merging is already tested in vhd-lib, don't retest it here (and theses vhd are as empty as my stomach at 12h12)
// only check deletion // only check deletion

View File

@ -4,11 +4,11 @@
We apply patches and fix security issues for the following versions: We apply patches and fix security issues for the following versions:
| Version | Supported | | Version | Supported |
| ------- | ------------------ | | --------------- | ------------------ |
| XOA `latest` | :white_check_mark: | | XOA `latest` | :white_check_mark: |
| XOA `stable` | :white_check_mark: | | XOA `stable` | :white_check_mark: |
| `master` branch | :white_check_mark: | | `master` branch | :white_check_mark: |
| anything else | :x: | | anything else | :x: |
## Reporting a Vulnerability ## Reporting a Vulnerability

View File

@ -109,10 +109,13 @@ As a temporary workaround you can increase the timeout higher than the default v
::: :::
Create the following file: Create the following file:
``` ```
/etc/xo-server/config.httpInactivityTimeout.toml /etc/xo-server/config.httpInactivityTimeout.toml
``` ```
Add the following lines: Add the following lines:
``` ```
# XOA Support - Work-around HTTP timeout issue during backups # XOA Support - Work-around HTTP timeout issue during backups
[xapiOptions] [xapiOptions]

View File

@ -209,12 +209,14 @@ You can verify that your time is correctly set with the `date` command. To set X
## Setting a custom NTP server ## Setting a custom NTP server
By default, XOA is configured to use the standard Debian NTP servers: By default, XOA is configured to use the standard Debian NTP servers:
``` ```
pool 0.debian.pool.ntp.org iburst pool 0.debian.pool.ntp.org iburst
pool 1.debian.pool.ntp.org iburst pool 1.debian.pool.ntp.org iburst
pool 2.debian.pool.ntp.org iburst pool 2.debian.pool.ntp.org iburst
pool 3.debian.pool.ntp.org iburst pool 3.debian.pool.ntp.org iburst
``` ```
If you'd like to use your own NTP server or another pool, you can make the changes directly in `/etc/ntp.conf`. If you'd like to use your own NTP server or another pool, you can make the changes directly in `/etc/ntp.conf`.
You will need to be root to edit this file (or use `sudo`). We recommend adding your custom server to the top of the list, leaving the debian server entries if possible. You will need to be root to edit this file (or use `sudo`). We recommend adding your custom server to the top of the list, leaving the debian server entries if possible.

View File

@ -13,7 +13,7 @@ export const configurationSchema = {
properties: { properties: {
callbackUrl: { callbackUrl: {
title: 'callbackUrl', title: 'callbackUrl',
description: "the callback URL", description: 'the callback URL',
type: 'string', type: 'string',
}, },
cert: { cert: {

View File

@ -254,7 +254,8 @@ const CleanVmTask = ({ children, className, task }) =>
) : null ) : null
const HealthCheckTask = ({ children, className, task }) => ( const HealthCheckTask = ({ children, className, task }) => (
<li className={className}> <li className={className}>
<Icon icon='health' /> {task.message} <TaskStateInfos status={task.status} /> <TaskWarnings warnings={task.warnings} /> <Icon icon='health' /> {task.message} <TaskStateInfos status={task.status} />{' '}
<TaskWarnings warnings={task.warnings} />
{children} {children}
<TaskStart task={task} /> <TaskStart task={task} />
<TaskEnd task={task} /> <TaskEnd task={task} />