aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/initializers
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-07-07 16:57:28 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-07-07 18:23:18 +0200
commit709756b8e183f67ef9bf8f7bc149af4736260350 (patch)
treedc5e52878a6f56c69a4589e058e830c57b025a05 /server/initializers
parent18c8e945089bff49d2c617c411c8a8f4575989ad (diff)
downloadPeerTube-709756b8e183f67ef9bf8f7bc149af4736260350.tar.gz
PeerTube-709756b8e183f67ef9bf8f7bc149af4736260350.tar.zst
PeerTube-709756b8e183f67ef9bf8f7bc149af4736260350.zip
Async signature and various fixes
Diffstat (limited to 'server/initializers')
-rw-r--r--server/initializers/constants.ts7
-rw-r--r--server/initializers/migrator.ts4
2 files changed, 7 insertions, 4 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index bf99f4df6..2792d3228 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -287,6 +287,10 @@ const USER_ROLES: { [ id: string ]: UserRole } = {
287 287
288// --------------------------------------------------------------------------- 288// ---------------------------------------------------------------------------
289 289
290const OPENGRAPH_COMMENT = '<!-- opengraph tags -->'
291
292// ---------------------------------------------------------------------------
293
290// Special constants for a test instance 294// Special constants for a test instance
291if (isTestInstance() === true) { 295if (isTestInstance() === true) {
292 CONSTRAINTS_FIELDS.VIDEOS.DURATION.max = 14 296 CONSTRAINTS_FIELDS.VIDEOS.DURATION.max = 14
@@ -306,12 +310,13 @@ export {
306 CONFIG, 310 CONFIG,
307 CONSTRAINTS_FIELDS, 311 CONSTRAINTS_FIELDS,
308 FRIEND_SCORE, 312 FRIEND_SCORE,
309 JOBS_FETCHING_INTERVAL,
310 JOB_STATES, 313 JOB_STATES,
311 JOBS_CONCURRENCY, 314 JOBS_CONCURRENCY,
312 JOBS_FETCH_LIMIT_PER_CYCLE, 315 JOBS_FETCH_LIMIT_PER_CYCLE,
316 JOBS_FETCHING_INTERVAL,
313 LAST_MIGRATION_VERSION, 317 LAST_MIGRATION_VERSION,
314 OAUTH_LIFETIME, 318 OAUTH_LIFETIME,
319 OPENGRAPH_COMMENT,
315 PAGINATION_COUNT_DEFAULT, 320 PAGINATION_COUNT_DEFAULT,
316 PODS_SCORE, 321 PODS_SCORE,
317 PREVIEWS_SIZE, 322 PREVIEWS_SIZE,
diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts
index d381551b5..3184ec920 100644
--- a/server/initializers/migrator.ts
+++ b/server/initializers/migrator.ts
@@ -35,9 +35,7 @@ function migrate () {
35 return getMigrationScripts().then(migrationScripts => ({ actualVersion, migrationScripts })) 35 return getMigrationScripts().then(migrationScripts => ({ actualVersion, migrationScripts }))
36 }) 36 })
37 .then(({ actualVersion, migrationScripts }) => { 37 .then(({ actualVersion, migrationScripts }) => {
38 return Promise.mapSeries(migrationScripts, entity => { 38 return Promise.each(migrationScripts, entity => executeMigration(actualVersion, entity))
39 return executeMigration(actualVersion, entity)
40 })
41 }) 39 })
42 .then(() => { 40 .then(() => {
43 logger.info('Migrations finished. New migration version schema: %s', LAST_MIGRATION_VERSION) 41 logger.info('Migrations finished. New migration version schema: %s', LAST_MIGRATION_VERSION)