aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/controllers/api/v1/index.js7
-rw-r--r--server/helpers/logger.js2
-rw-r--r--server/helpers/peertubeCrypto.js2
-rw-r--r--server/initializers/checker.js2
-rw-r--r--server/lib/videos.js2
-rw-r--r--server/models/videos.js2
-rw-r--r--server/tests/api/checkParams.js2
-rw-r--r--server/tests/api/singlePod.js2
-rw-r--r--server/tests/api/utils.js4
9 files changed, 16 insertions, 9 deletions
diff --git a/server/controllers/api/v1/index.js b/server/controllers/api/v1/index.js
index 07a68ed9d..abbc5eb60 100644
--- a/server/controllers/api/v1/index.js
+++ b/server/controllers/api/v1/index.js
@@ -11,7 +11,14 @@ var videosController = require('./videos')
11router.use('/pods', podsController) 11router.use('/pods', podsController)
12router.use('/remotevideos', remoteVideosController) 12router.use('/remotevideos', remoteVideosController)
13router.use('/videos', videosController) 13router.use('/videos', videosController)
14router.use('/*', badRequest)
14 15
15// --------------------------------------------------------------------------- 16// ---------------------------------------------------------------------------
16 17
17module.exports = router 18module.exports = router
19
20// ---------------------------------------------------------------------------
21
22function badRequest (req, res, next) {
23 res.sendStatus(400)
24}
diff --git a/server/helpers/logger.js b/server/helpers/logger.js
index 67f69a875..1c15a0edd 100644
--- a/server/helpers/logger.js
+++ b/server/helpers/logger.js
@@ -6,7 +6,7 @@ var path = require('path')
6var winston = require('winston') 6var winston = require('winston')
7winston.emitErrs = true 7winston.emitErrs = true
8 8
9var logDir = path.join(__dirname, '..', config.get('storage.logs')) 9var logDir = path.join(__dirname, '..', '..', config.get('storage.logs'))
10var logger = new winston.Logger({ 10var logger = new winston.Logger({
11 transports: [ 11 transports: [
12 new winston.transports.File({ 12 new winston.transports.File({
diff --git a/server/helpers/peertubeCrypto.js b/server/helpers/peertubeCrypto.js
index 29b9d79c9..7e65c43e1 100644
--- a/server/helpers/peertubeCrypto.js
+++ b/server/helpers/peertubeCrypto.js
@@ -9,7 +9,7 @@ var ursa = require('ursa')
9 9
10var logger = require('./logger') 10var logger = require('./logger')
11 11
12var certDir = path.join(__dirname, '..', config.get('storage.certs')) 12var certDir = path.join(__dirname, '..', '..', config.get('storage.certs'))
13var algorithm = 'aes-256-ctr' 13var algorithm = 'aes-256-ctr'
14 14
15var peertubeCrypto = { 15var peertubeCrypto = {
diff --git a/server/initializers/checker.js b/server/initializers/checker.js
index ec7bc0ad2..44d9ea85b 100644
--- a/server/initializers/checker.js
+++ b/server/initializers/checker.js
@@ -34,7 +34,7 @@ function createDirectoriesIfNotExist () {
34 for (var key of Object.keys(storages)) { 34 for (var key of Object.keys(storages)) {
35 var dir = storages[key] 35 var dir = storages[key]
36 try { 36 try {
37 mkdirp.sync(path.join(__dirname, '..', dir)) 37 mkdirp.sync(path.join(__dirname, '..', '..', dir))
38 } catch (error) { 38 } catch (error) {
39 throw new Error('Cannot create ' + path + ':' + error) 39 throw new Error('Cannot create ' + path + ':' + error)
40 } 40 }
diff --git a/server/lib/videos.js b/server/lib/videos.js
index 1e0a83b8b..3c6ee4a65 100644
--- a/server/lib/videos.js
+++ b/server/lib/videos.js
@@ -9,7 +9,7 @@ var webtorrent = require('../lib/webtorrent')
9var logger = require('../helpers/logger') 9var logger = require('../helpers/logger')
10var Videos = require('../models/videos') 10var Videos = require('../models/videos')
11 11
12var uploadDir = path.join(__dirname, '..', config.get('storage.uploads')) 12var uploadDir = path.join(__dirname, '..', '..', config.get('storage.uploads'))
13 13
14var videos = { 14var videos = {
15 seed: seed, 15 seed: seed,
diff --git a/server/models/videos.js b/server/models/videos.js
index 5e2eeae07..436c08bfd 100644
--- a/server/models/videos.js
+++ b/server/models/videos.js
@@ -12,7 +12,7 @@ var logger = require('../helpers/logger')
12var http = config.get('webserver.https') === true ? 'https' : 'http' 12var http = config.get('webserver.https') === true ? 'https' : 'http'
13var host = config.get('webserver.host') 13var host = config.get('webserver.host')
14var port = config.get('webserver.port') 14var port = config.get('webserver.port')
15var uploadDir = path.join(__dirname, '..', config.get('storage.uploads')) 15var uploadDir = path.join(__dirname, '..', '..', config.get('storage.uploads'))
16 16
17// --------------------------------------------------------------------------- 17// ---------------------------------------------------------------------------
18 18
diff --git a/server/tests/api/checkParams.js b/server/tests/api/checkParams.js
index 1c1ec71b3..01b620873 100644
--- a/server/tests/api/checkParams.js
+++ b/server/tests/api/checkParams.js
@@ -252,7 +252,7 @@ describe('Test parameters validator', function () {
252 it('Should have 404 with nothing', function (done) { 252 it('Should have 404 with nothing', function (done) {
253 request(url) 253 request(url)
254 .delete(path) 254 .delete(path)
255 .expect(404, done) 255 .expect(400, done)
256 }) 256 })
257 257
258 it('Should fail without a mongodb id', function (done) { 258 it('Should fail without a mongodb id', function (done) {
diff --git a/server/tests/api/singlePod.js b/server/tests/api/singlePod.js
index 3dd72c01b..d572aacf6 100644
--- a/server/tests/api/singlePod.js
+++ b/server/tests/api/singlePod.js
@@ -112,7 +112,7 @@ describe('Test a single pod', function () {
112 utils.removeVideo(url, video_id, function (err) { 112 utils.removeVideo(url, video_id, function (err) {
113 if (err) throw err 113 if (err) throw err
114 114
115 fs.readdir(pathUtils.join(__dirname, '../../test1/uploads/'), function (err, files) { 115 fs.readdir(pathUtils.join(__dirname, '../../../test1/uploads/'), function (err, files) {
116 if (err) throw err 116 if (err) throw err
117 117
118 expect(files.length).to.equal(0) 118 expect(files.length).to.equal(0)
diff --git a/server/tests/api/utils.js b/server/tests/api/utils.js
index 47b706294..c70696571 100644
--- a/server/tests/api/utils.js
+++ b/server/tests/api/utils.js
@@ -22,7 +22,7 @@ var testUtils = {
22// ---------------------- Export functions -------------------- 22// ---------------------- Export functions --------------------
23 23
24function flushTests (callback) { 24function flushTests (callback) {
25 exec(pathUtils.join(__dirname, '../../scripts/clean_test.sh'), callback) 25 exec(pathUtils.join(__dirname, '../../../bin/clean_test.sh'), callback)
26} 26}
27 27
28function getFriendsList (url, end) { 28function getFriendsList (url, end) {
@@ -139,7 +139,7 @@ function runServer (number, callback) {
139 detached: true 139 detached: true
140 } 140 }
141 141
142 var app = fork(pathUtils.join(__dirname, '../../server.js'), [], options) 142 var app = fork(pathUtils.join(__dirname, '../../../server.js'), [], options)
143 app.stdout.on('data', function onStdout (data) { 143 app.stdout.on('data', function onStdout (data) {
144 var dont_continue = false 144 var dont_continue = false
145 // Check if all required sentences are here 145 // Check if all required sentences are here