diff options
-rw-r--r-- | server.js | 46 | ||||
-rw-r--r-- | server/initializers/constants.js | 16 | ||||
-rw-r--r-- | server/initializers/database.js | 1 | ||||
-rw-r--r-- | server/initializers/migrations/0005-create-application.js | 17 | ||||
-rw-r--r-- | server/initializers/migrations/0010-users-password.js | 23 | ||||
-rw-r--r-- | server/initializers/migrator.js | 56 | ||||
-rw-r--r-- | server/models/application.js | 31 | ||||
-rw-r--r-- | server/models/user.js | 5 |
8 files changed, 174 insertions, 21 deletions
@@ -32,6 +32,7 @@ if (miss.length !== 0) { | |||
32 | // ----------- PeerTube modules ----------- | 32 | // ----------- PeerTube modules ----------- |
33 | const customValidators = require('./server/helpers/custom-validators') | 33 | const customValidators = require('./server/helpers/custom-validators') |
34 | const installer = require('./server/initializers/installer') | 34 | const installer = require('./server/initializers/installer') |
35 | const migrator = require('./server/initializers/migrator') | ||
35 | const mongoose = require('mongoose') | 36 | const mongoose = require('mongoose') |
36 | const routes = require('./server/controllers') | 37 | const routes = require('./server/controllers') |
37 | const utils = require('./server/helpers/utils') | 38 | const utils = require('./server/helpers/utils') |
@@ -127,31 +128,36 @@ app.use(function (err, req, res, next) { | |||
127 | installer.installApplication(function (err) { | 128 | installer.installApplication(function (err) { |
128 | if (err) throw err | 129 | if (err) throw err |
129 | 130 | ||
130 | // Create/activate the webtorrent module | 131 | // Run the migration scripts if needed |
131 | webtorrent.create(function () { | 132 | migrator.migrate(function (err) { |
132 | function cleanForExit () { | 133 | if (err) throw err |
133 | utils.cleanForExit(webtorrent.app) | ||
134 | } | ||
135 | 134 | ||
136 | function exitGracefullyOnSignal () { | 135 | // Create/activate the webtorrent module |
137 | process.exit(-1) | 136 | webtorrent.create(function () { |
138 | } | 137 | function cleanForExit () { |
138 | utils.cleanForExit(webtorrent.app) | ||
139 | } | ||
139 | 140 | ||
140 | process.on('exit', cleanForExit) | 141 | function exitGracefullyOnSignal () { |
141 | process.on('SIGINT', exitGracefullyOnSignal) | 142 | process.exit(-1) |
142 | process.on('SIGTERM', exitGracefullyOnSignal) | 143 | } |
143 | 144 | ||
144 | // ----------- Make the server listening ----------- | 145 | process.on('exit', cleanForExit) |
145 | server.listen(port, function () { | 146 | process.on('SIGINT', exitGracefullyOnSignal) |
146 | // Activate the pool requests | 147 | process.on('SIGTERM', exitGracefullyOnSignal) |
147 | Request.activate() | ||
148 | 148 | ||
149 | Video.seedAllExisting(function (err) { | 149 | // ----------- Make the server listening ----------- |
150 | if (err) throw err | 150 | server.listen(port, function () { |
151 | // Activate the pool requests | ||
152 | Request.activate() | ||
151 | 153 | ||
152 | logger.info('Seeded all the videos') | 154 | Video.seedAllExisting(function (err) { |
153 | logger.info('Server listening on port %d', port) | 155 | if (err) throw err |
154 | app.emit('ready') | 156 | |
157 | logger.info('Seeded all the videos') | ||
158 | logger.info('Server listening on port %d', port) | ||
159 | app.emit('ready') | ||
160 | }) | ||
155 | }) | 161 | }) |
156 | }) | 162 | }) |
157 | }) | 163 | }) |
diff --git a/server/initializers/constants.js b/server/initializers/constants.js index 76ebb8681..10ae48e95 100644 --- a/server/initializers/constants.js +++ b/server/initializers/constants.js | |||
@@ -54,6 +54,18 @@ const FRIEND_SCORE = { | |||
54 | MAX: 1000 | 54 | MAX: 1000 |
55 | } | 55 | } |
56 | 56 | ||
57 | const MONGO_MIGRATION_SCRIPTS = [ | ||
58 | { | ||
59 | script: '0005-create-application', | ||
60 | version: 5 | ||
61 | }, | ||
62 | { | ||
63 | script: '0010-users-password', | ||
64 | version: 10 | ||
65 | } | ||
66 | ] | ||
67 | const LAST_MONGO_SCHEMA_VERSION = 10 | ||
68 | |||
57 | // Time to wait between requests to the friends (10 min) | 69 | // Time to wait between requests to the friends (10 min) |
58 | let REQUESTS_INTERVAL = 600000 | 70 | let REQUESTS_INTERVAL = 600000 |
59 | 71 | ||
@@ -121,11 +133,13 @@ module.exports = { | |||
121 | CONFIG: CONFIG, | 133 | CONFIG: CONFIG, |
122 | CONSTRAINTS_FIELDS: CONSTRAINTS_FIELDS, | 134 | CONSTRAINTS_FIELDS: CONSTRAINTS_FIELDS, |
123 | FRIEND_SCORE: FRIEND_SCORE, | 135 | FRIEND_SCORE: FRIEND_SCORE, |
124 | REQUESTS_INTERVAL: REQUESTS_INTERVAL, | 136 | LAST_MONGO_SCHEMA_VERSION: LAST_MONGO_SCHEMA_VERSION, |
137 | MONGO_MIGRATION_SCRIPTS: MONGO_MIGRATION_SCRIPTS, | ||
125 | OAUTH_LIFETIME: OAUTH_LIFETIME, | 138 | OAUTH_LIFETIME: OAUTH_LIFETIME, |
126 | PAGINATION_COUNT_DEFAULT: PAGINATION_COUNT_DEFAULT, | 139 | PAGINATION_COUNT_DEFAULT: PAGINATION_COUNT_DEFAULT, |
127 | PODS_SCORE: PODS_SCORE, | 140 | PODS_SCORE: PODS_SCORE, |
128 | REQUESTS_IN_PARALLEL: REQUESTS_IN_PARALLEL, | 141 | REQUESTS_IN_PARALLEL: REQUESTS_IN_PARALLEL, |
142 | REQUESTS_INTERVAL: REQUESTS_INTERVAL, | ||
129 | REQUESTS_LIMIT: REQUESTS_LIMIT, | 143 | REQUESTS_LIMIT: REQUESTS_LIMIT, |
130 | RETRY_REQUESTS: RETRY_REQUESTS, | 144 | RETRY_REQUESTS: RETRY_REQUESTS, |
131 | SEARCHABLE_COLUMNS: SEARCHABLE_COLUMNS, | 145 | SEARCHABLE_COLUMNS: SEARCHABLE_COLUMNS, |
diff --git a/server/initializers/database.js b/server/initializers/database.js index 20dcc056e..1da574631 100644 --- a/server/initializers/database.js +++ b/server/initializers/database.js | |||
@@ -6,6 +6,7 @@ const constants = require('../initializers/constants') | |||
6 | const logger = require('../helpers/logger') | 6 | const logger = require('../helpers/logger') |
7 | 7 | ||
8 | // Bootstrap models | 8 | // Bootstrap models |
9 | require('../models/application') | ||
9 | require('../models/user') | 10 | require('../models/user') |
10 | require('../models/oauth-client') | 11 | require('../models/oauth-client') |
11 | require('../models/oauth-token') | 12 | require('../models/oauth-token') |
diff --git a/server/initializers/migrations/0005-create-application.js b/server/initializers/migrations/0005-create-application.js new file mode 100644 index 000000000..e99dec019 --- /dev/null +++ b/server/initializers/migrations/0005-create-application.js | |||
@@ -0,0 +1,17 @@ | |||
1 | /* | ||
2 | Create the application collection in MongoDB. | ||
3 | Used to store the actual MongoDB scheme version. | ||
4 | */ | ||
5 | |||
6 | const mongoose = require('mongoose') | ||
7 | |||
8 | const Application = mongoose.model('Application') | ||
9 | |||
10 | exports.up = function (callback) { | ||
11 | const application = new Application() | ||
12 | application.save(callback) | ||
13 | } | ||
14 | |||
15 | exports.down = function (callback) { | ||
16 | throw new Error('Not implemented.') | ||
17 | } | ||
diff --git a/server/initializers/migrations/0010-users-password.js b/server/initializers/migrations/0010-users-password.js new file mode 100644 index 000000000..e031fa142 --- /dev/null +++ b/server/initializers/migrations/0010-users-password.js | |||
@@ -0,0 +1,23 @@ | |||
1 | /* | ||
2 | Convert plain user password to encrypted user password. | ||
3 | */ | ||
4 | |||
5 | const mongoose = require('mongoose') | ||
6 | |||
7 | const User = mongoose.model('User') | ||
8 | |||
9 | exports.up = function (callback) { | ||
10 | User.list(function (err, users) { | ||
11 | if (err) return callback(err) | ||
12 | |||
13 | users.forEach(function (user) { | ||
14 | user.save() | ||
15 | }) | ||
16 | |||
17 | return callback(null) | ||
18 | }) | ||
19 | } | ||
20 | |||
21 | exports.down = function (callback) { | ||
22 | throw new Error('Not implemented.') | ||
23 | } | ||
diff --git a/server/initializers/migrator.js b/server/initializers/migrator.js new file mode 100644 index 000000000..6b31d994f --- /dev/null +++ b/server/initializers/migrator.js | |||
@@ -0,0 +1,56 @@ | |||
1 | 'use strict' | ||
2 | |||
3 | const eachSeries = require('async/eachSeries') | ||
4 | const mongoose = require('mongoose') | ||
5 | const path = require('path') | ||
6 | |||
7 | const constants = require('./constants') | ||
8 | const logger = require('../helpers/logger') | ||
9 | |||
10 | const Application = mongoose.model('Application') | ||
11 | |||
12 | const migrator = { | ||
13 | migrate: migrate | ||
14 | } | ||
15 | |||
16 | function migrate (callback) { | ||
17 | Application.loadMongoSchemaVersion(function (err, actualVersion) { | ||
18 | if (err) return callback(err) | ||
19 | |||
20 | // If there are a new mongo schemas | ||
21 | if (!actualVersion || actualVersion < constants.LAST_MONGO_SCHEMA_VERSION) { | ||
22 | logger.info('Begin migrations.') | ||
23 | |||
24 | eachSeries(constants.MONGO_MIGRATION_SCRIPTS, function (entity, callbackEach) { | ||
25 | const versionScript = entity.version | ||
26 | |||
27 | // Do not execute old migration scripts | ||
28 | if (versionScript <= actualVersion) return callbackEach(null) | ||
29 | |||
30 | // Load the migration module and run it | ||
31 | const migrationScriptName = entity.script | ||
32 | logger.info('Executing %s migration script.', migrationScriptName) | ||
33 | |||
34 | const migrationScript = require(path.join(__dirname, 'migrations', migrationScriptName)) | ||
35 | migrationScript.up(function (err) { | ||
36 | if (err) return callbackEach(err) | ||
37 | |||
38 | // Update the new mongo version schema | ||
39 | Application.updateMongoSchemaVersion(versionScript, callbackEach) | ||
40 | }) | ||
41 | }, function (err) { | ||
42 | if (err) return callback(err) | ||
43 | |||
44 | logger.info('Migrations finished. New mongo version schema: %s', constants.LAST_MONGO_SCHEMA_VERSION) | ||
45 | return callback(null) | ||
46 | }) | ||
47 | } else { | ||
48 | return callback(null) | ||
49 | } | ||
50 | }) | ||
51 | } | ||
52 | |||
53 | // --------------------------------------------------------------------------- | ||
54 | |||
55 | module.exports = migrator | ||
56 | |||
diff --git a/server/models/application.js b/server/models/application.js new file mode 100644 index 000000000..8185f0915 --- /dev/null +++ b/server/models/application.js | |||
@@ -0,0 +1,31 @@ | |||
1 | const mongoose = require('mongoose') | ||
2 | |||
3 | // --------------------------------------------------------------------------- | ||
4 | |||
5 | const ApplicationSchema = mongoose.Schema({ | ||
6 | mongoSchemaVersion: { | ||
7 | type: Number, | ||
8 | default: 0 | ||
9 | } | ||
10 | }) | ||
11 | |||
12 | ApplicationSchema.statics = { | ||
13 | loadMongoSchemaVersion: loadMongoSchemaVersion, | ||
14 | updateMongoSchemaVersion: updateMongoSchemaVersion | ||
15 | } | ||
16 | |||
17 | mongoose.model('Application', ApplicationSchema) | ||
18 | |||
19 | // --------------------------------------------------------------------------- | ||
20 | |||
21 | function loadMongoSchemaVersion (callback) { | ||
22 | return this.findOne({}, { mongoSchemaVersion: 1 }, function (err, data) { | ||
23 | const version = data ? data.mongoSchemaVersion : 0 | ||
24 | |||
25 | return callback(err, version) | ||
26 | }) | ||
27 | } | ||
28 | |||
29 | function updateMongoSchemaVersion (newVersion, callback) { | ||
30 | return this.update({}, { mongoSchemaVersion: newVersion }, callback) | ||
31 | } | ||
diff --git a/server/models/user.js b/server/models/user.js index db6f1765b..c2c8807f0 100644 --- a/server/models/user.js +++ b/server/models/user.js | |||
@@ -28,6 +28,7 @@ UserSchema.methods = { | |||
28 | UserSchema.statics = { | 28 | UserSchema.statics = { |
29 | countTotal: countTotal, | 29 | countTotal: countTotal, |
30 | getByUsername: getByUsername, | 30 | getByUsername: getByUsername, |
31 | list: list, | ||
31 | listForApi: listForApi, | 32 | listForApi: listForApi, |
32 | loadById: loadById, | 33 | loadById: loadById, |
33 | loadByUsername: loadByUsername | 34 | loadByUsername: loadByUsername |
@@ -71,6 +72,10 @@ function getByUsername (username) { | |||
71 | return this.findOne({ username: username }) | 72 | return this.findOne({ username: username }) |
72 | } | 73 | } |
73 | 74 | ||
75 | function list (callback) { | ||
76 | return this.find(callback) | ||
77 | } | ||
78 | |||
74 | function listForApi (start, count, sort, callback) { | 79 | function listForApi (start, count, sort, callback) { |
75 | const query = {} | 80 | const query = {} |
76 | return modelUtils.listForApiWithCount.call(this, query, start, count, sort, callback) | 81 | return modelUtils.listForApiWithCount.call(this, query, start, count, sort, callback) |