aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-05-11 20:43:07 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-05-13 14:23:11 +0200
commit09bc69df7a82ff7c7a3bc4d8c9feef8a64a7c517 (patch)
tree749d91ec074bc1a90c29c53368fc705c89b607bb
parent504b79cb6753c9b4fb48875a205afc8fd9b8e353 (diff)
downloadPeerTube-09bc69df7a82ff7c7a3bc4d8c9feef8a64a7c517.tar.gz
PeerTube-09bc69df7a82ff7c7a3bc4d8c9feef8a64a7c517.tar.zst
PeerTube-09bc69df7a82ff7c7a3bc4d8c9feef8a64a7c517.zip
Add debug electron setting
-rw-r--r--config/default.yaml3
-rw-r--r--config/test.yaml3
-rw-r--r--server/initializers/checker.js2
-rw-r--r--server/lib/webtorrent.js16
4 files changed, 17 insertions, 7 deletions
diff --git a/config/default.yaml b/config/default.yaml
index 87b72aa3b..b5fd7b06d 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -20,3 +20,6 @@ storage:
20 20
21network: 21network:
22 friends: [] 22 friends: []
23
24electron:
25 debug: false
diff --git a/config/test.yaml b/config/test.yaml
index 8a667a001..7f893bc4f 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -7,3 +7,6 @@ webserver:
7database: 7database:
8 host: 'localhost' 8 host: 'localhost'
9 port: 27017 9 port: 27017
10
11electron:
12 debug: false
diff --git a/server/initializers/checker.js b/server/initializers/checker.js
index cb62fabf4..7a2b5b132 100644
--- a/server/initializers/checker.js
+++ b/server/initializers/checker.js
@@ -16,7 +16,7 @@ function checkConfig () {
16 'webserver.https', 'webserver.host', 'webserver.port', 16 'webserver.https', 'webserver.host', 'webserver.port',
17 'database.host', 'database.port', 'database.suffix', 17 'database.host', 'database.port', 'database.suffix',
18 'storage.certs', 'storage.uploads', 'storage.logs', 18 'storage.certs', 'storage.uploads', 'storage.logs',
19 'network.friends' ] 19 'network.friends', 'electron.debug' ]
20 const miss = [] 20 const miss = []
21 21
22 for (const key of required) { 22 for (const key of required) {
diff --git a/server/lib/webtorrent.js b/server/lib/webtorrent.js
index e2e2586f9..656f8c7a8 100644
--- a/server/lib/webtorrent.js
+++ b/server/lib/webtorrent.js
@@ -7,6 +7,7 @@ const spawn = require('electron-spawn')
7 7
8const logger = require('../helpers/logger') 8const logger = require('../helpers/logger')
9 9
10const electron_debug = config.get('electron.debug')
10let host = config.get('webserver.host') 11let host = config.get('webserver.host')
11let port = config.get('webserver.port') 12let port = config.get('webserver.port')
12let nodeKey = 'webtorrentnode' + port 13let nodeKey = 'webtorrentnode' + port
@@ -57,13 +58,16 @@ function create (options, callback) {
57 }) 58 })
58 59
59 const webtorrent_process = spawn(pathUtils.join(__dirname, 'webtorrentProcess.js'), host, port, { detached: true }) 60 const webtorrent_process = spawn(pathUtils.join(__dirname, 'webtorrentProcess.js'), host, port, { detached: true })
60 webtorrent_process.stderr.on('data', function (data) {
61 // logger.debug('Webtorrent process stderr: ', data.toString())
62 })
63 61
64 webtorrent_process.stdout.on('data', function (data) { 62 if (electron_debug === true) {
65 // logger.debug('Webtorrent process:', data.toString()) 63 webtorrent_process.stderr.on('data', function (data) {
66 }) 64 logger.debug('Webtorrent process stderr: ', data.toString())
65 })
66
67 webtorrent_process.stdout.on('data', function (data) {
68 logger.debug('Webtorrent process:', data.toString())
69 })
70 }
67 71
68 webtorrent.app = webtorrent_process 72 webtorrent.app = webtorrent_process
69 }) 73 })