forks
/
peertube
1
0
Fork 0
Code Releases Activity

Fix check after init script

This commit is contained in:
Chocobozzz 2021-10-13 08:44:34 +02:00
parent 87699a09ce
commit d41a380550
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/initializers/checker-after-init.ts
View File

@ -1,4 +1,4 @@
import { util, has, get } from 'config'
import config from 'config'
import { uniq } from 'lodash'
import { URL } from 'url'
import { getFFmpegVersion } from '@server/helpers/ffmpeg-utils'
@ -7,9 +7,9 @@ import { RecentlyAddedStrategy } from '../../shared/models/redundancy'
import { isProdInstance, isTestInstance, parseSemVersion } from '../helpers/core-utils'
import { isArray } from '../helpers/custom-validators/misc'
import { logger } from '../helpers/logger'
import { UserModel } from '../models/user/user'
import { ApplicationModel, getServerActor } from '../models/application/application'
import { OAuthClientModel } from '../models/oauth/oauth-client'
import { UserModel } from '../models/user/user'
import { CONFIG, isEmailEnabled } from './config'
import { WEBSERVER } from './constants'
@ -18,8 +18,8 @@ async function checkActivityPubUrls () {
const parsed = new URL(actor.url)
if (WEBSERVER.HOST !== parsed.host) {
const NODE_ENV = util.getEnv('NODE_ENV')
const NODE_CONFIG_DIR = util.getEnv('NODE_CONFIG_DIR')
const NODE_ENV = config.util.getEnv('NODE_ENV')
const NODE_CONFIG_DIR = config.util.getEnv('NODE_CONFIG_DIR')
logger.warn(
'It seems PeerTube was started (and created some data) with another domain name. ' +
@ -36,7 +36,7 @@ async function checkActivityPubUrls () {
function checkConfig () {
// Moved configuration keys
if (has('services.csp-logger')) {
if (config.has('services.csp-logger')) {
logger.warn('services.csp-logger configuration has been renamed to csp.report_uri. Please update your configuration file.')
}
@ -97,7 +97,7 @@ function checkConfig () {
// Check storage directory locations
if (isProdInstance()) {
const configStorage = get('storage')
const configStorage = config.get('storage')
for (const key of Object.keys(configStorage)) {
if (configStorage[key].startsWith('storage/')) {
logger.warn(

5
server/lib/files-cache/actor-follow-score-cache.ts
View File

@ -19,7 +19,10 @@ class ActorFollowScoreCache {
updateActorFollowsScore (goodInboxes: string[], badInboxes: string[]) {
if (goodInboxes.length === 0 && badInboxes.length === 0) return
logger.info('Updating %d good actor follows and %d bad actor follows scores in cache.', goodInboxes.length, badInboxes.length)
logger.info(
'Updating %d good actor follows and %d bad actor follows scores in cache.',
goodInboxes.length, badInboxes.length, { badInboxes }
)
for (const goodInbox of goodInboxes) {
if (this.pendingFollowsScore[goodInbox] === undefined) this.pendingFollowsScore[goodInbox] = 0