From d6a5b018b89f9d2569ca7435b0e270095c93cc17 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Sun, 15 Jan 2017 19:13:16 +0100
Subject: Server: retryer transaction wrapper refractoring

---
 server/controllers/api/remote/videos.js | 34 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

(limited to 'server/controllers/api/remote')

diff --git a/server/controllers/api/remote/videos.js b/server/controllers/api/remote/videos.js
index c45a86dbb..9d007246f 100644
--- a/server/controllers/api/remote/videos.js
+++ b/server/controllers/api/remote/videos.js
@@ -66,19 +66,12 @@ function remoteVideos (req, res, next) {
 
 // Handle retries on fail
 function addRemoteVideoRetryWrapper (videoToCreateData, fromPod, finalCallback) {
-  utils.transactionRetryer(
-    function (callback) {
-      return addRemoteVideo(videoToCreateData, fromPod, callback)
-    },
-    function (err) {
-      if (err) {
-        logger.error('Cannot insert the remote video with many retries.', { error: err })
-      }
+  const options = {
+    arguments: [ videoToCreateData, fromPod ],
+    errorMessage: 'Cannot insert the remote video with many retries.'
+  }
 
-      // Do not return the error, continue the process
-      return finalCallback(null)
-    }
-  )
+  utils.retryWrapper(addRemoteVideo, options, finalCallback)
 }
 
 function addRemoteVideo (videoToCreateData, fromPod, finalCallback) {
@@ -182,19 +175,12 @@ function addRemoteVideo (videoToCreateData, fromPod, finalCallback) {
 
 // Handle retries on fail
 function updateRemoteVideoRetryWrapper (videoAttributesToUpdate, fromPod, finalCallback) {
-  utils.transactionRetryer(
-    function (callback) {
-      return updateRemoteVideo(videoAttributesToUpdate, fromPod, callback)
-    },
-    function (err) {
-      if (err) {
-        logger.error('Cannot update the remote video with many retries.', { error: err })
-      }
+  const options = {
+    arguments: [ fromPod, videoAttributesToUpdate ],
+    errorMessage: 'Cannot update the remote video with many retries'
+  }
 
-      // Do not return the error, continue the process
-      return finalCallback(null)
-    }
-  )
+  utils.retryWrapper(updateRemoteVideo, options, finalCallback)
 }
 
 function updateRemoteVideo (videoAttributesToUpdate, fromPod, finalCallback) {
-- 
cgit v1.2.3