From b3077e417056f18225957f65419b87de72117fe3 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Sun, 7 Feb 2016 10:39:37 +0100
Subject: Standard v6

---
 lib/poolRequests.js | 4 ++--
 lib/videos.js       | 3 ++-
 lib/webtorrent.js   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/poolRequests.js b/lib/poolRequests.js
index 5b7d5489d..9ea41f383 100644
--- a/lib/poolRequests.js
+++ b/lib/poolRequests.js
@@ -41,7 +41,7 @@
         }
 
         // Remove the request of the other type
-        PoolRequests.removeById(id, function (err) {
+        PoolRequests.removeRequestById(id, function (err) {
           if (err) {
             logger.error('Cannot remove a pool request.', { error: err })
             return // Abort
@@ -49,7 +49,7 @@
         })
       } else {
         PoolRequests.create(id, type, request, function (err) {
-          logger.error('Cannot create a pool request.', { error: err })
+          if (err) logger.error('Cannot create a pool request.', { error: err })
           return // Abort
         })
       }
diff --git a/lib/videos.js b/lib/videos.js
index 1bb6f2493..0e8143351 100644
--- a/lib/videos.js
+++ b/lib/videos.js
@@ -3,12 +3,13 @@
 
   var async = require('async')
   var config = require('config')
+  var path = require('path')
   var webtorrent = require('../lib/webtorrent')
 
   var logger = require('../helpers/logger')
   var Videos = require('../models/videos')
 
-  var uploadDir = __dirname + '/../' + config.get('storage.uploads')
+  var uploadDir = path.join(__dirname, '..', config.get('storage.uploads'))
 
   var videos = {
     seed: seed,
diff --git a/lib/webtorrent.js b/lib/webtorrent.js
index 7cd38156c..083e5b77a 100644
--- a/lib/webtorrent.js
+++ b/lib/webtorrent.js
@@ -59,7 +59,7 @@
         process.exit()
       })
 
-      var webtorrent_process = spawn(__dirname + '/webtorrentProcess.js', host, port, { detached: true })
+      var webtorrent_process = spawn(pathUtils.join(__dirname, 'webtorrentProcess.js'), host, port, { detached: true })
       webtorrent_process.stderr.on('data', function (data) {
         // logger.debug('Webtorrent process stderr: ', data.toString())
       })
-- 
cgit v1.2.3