aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-01-11 18:41:40 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-01-11 18:41:40 +0100
commitedc5e86006bf5e4a2819c380bb65734fe9caa87e (patch)
tree39ae1dfd73772c416ed877698fbd08f88be5367e /server
parentf2cdb86675c3783ee903640b5b6f794fa09cdff2 (diff)
downloadPeerTube-edc5e86006bf5e4a2819c380bb65734fe9caa87e.tar.gz
PeerTube-edc5e86006bf5e4a2819c380bb65734fe9caa87e.tar.zst
PeerTube-edc5e86006bf5e4a2819c380bb65734fe9caa87e.zip
Server: transaction serializable for videos
Diffstat (limited to 'server')
-rw-r--r--server/controllers/api/remote/videos.js2
-rw-r--r--server/controllers/api/videos.js2
-rw-r--r--server/models/request.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/server/controllers/api/remote/videos.js b/server/controllers/api/remote/videos.js
index b9494f602..c45a86dbb 100644
--- a/server/controllers/api/remote/videos.js
+++ b/server/controllers/api/remote/videos.js
@@ -203,7 +203,7 @@ function updateRemoteVideo (videoAttributesToUpdate, fromPod, finalCallback) {
203 waterfall([ 203 waterfall([
204 204
205 function startTransaction (callback) { 205 function startTransaction (callback) {
206 db.sequelize.transaction().asCallback(function (err, t) { 206 db.sequelize.transaction({ isolationLevel: 'SERIALIZABLE' }).asCallback(function (err, t) {
207 return callback(err, t) 207 return callback(err, t)
208 }) 208 })
209 }, 209 },
diff --git a/server/controllers/api/videos.js b/server/controllers/api/videos.js
index df068f961..55d671f5b 100644
--- a/server/controllers/api/videos.js
+++ b/server/controllers/api/videos.js
@@ -264,7 +264,7 @@ function updateVideo (req, res, finalCallback) {
264 waterfall([ 264 waterfall([
265 265
266 function startTransaction (callback) { 266 function startTransaction (callback) {
267 db.sequelize.transaction().asCallback(function (err, t) { 267 db.sequelize.transaction({ isolationLevel: 'SERIALIZABLE' }).asCallback(function (err, t) {
268 return callback(err, t) 268 return callback(err, t)
269 }) 269 })
270 }, 270 },
diff --git a/server/models/request.js b/server/models/request.js
index e048c288b..cd52ea767 100644
--- a/server/models/request.js
+++ b/server/models/request.js
@@ -174,7 +174,7 @@ function makeRequests () {
174 }) 174 })
175 }) 175 })
176 176
177 logger.info('Making requests to friends.', { requests: requestsToMakeGrouped }) 177 logger.info('Making requests to friends.')
178 178
179 const goodPods = [] 179 const goodPods = []
180 const badPods = [] 180 const badPods = []