From 1cb4884db56c774e89db80bd0e79a9765441548d Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Sun, 6 Dec 2015 21:36:57 +0100
Subject: [PATCH] Logging refractoring

---
 middlewares/misc.js                 | 7 ++-----
 middlewares/reqValidators/remote.js | 2 +-
 src/pods.js                         | 1 -
 src/poolRequests.js                 | 1 -
 src/utils.js                        | 5 +----
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/middlewares/misc.js b/middlewares/misc.js
index 69e8d78c1..9755eeff0 100644
--- a/middlewares/misc.js
+++ b/middlewares/misc.js
@@ -25,15 +25,13 @@
   }
 
   misc.decryptBody = function (req, res, next) {
-    logger.debug('Decrypting body.')
-
     PodsDB.findOne({ url: req.body.signature.url }, function (err, pod) {
       if (err) {
         logger.error('Cannot get signed url in decryptBody.', { error: err })
         res.sendStatus(500)
       }
 
-      logger.debug('Found one pod which could send the message.', { pod: pod.publicKey, url: req.body.signature.url })
+      logger.debug('Decrypting body from %s.', req.body.signature.url)
 
       var crt = ursa.createPublicKey(pod.publicKey)
       var signature_ok = crt.hashAndVerify('sha256', new Buffer(req.body.signature.url).toString('hex'), req.body.signature.signature, 'hex')
@@ -41,9 +39,8 @@
       if (signature_ok === true) {
         var myKey = ursa.createPrivateKey(fs.readFileSync(utils.certDir + 'peertube.key.pem'))
         var decryptedKey = myKey.decrypt(req.body.key, 'hex', 'utf8')
-        logger.debug(decryptedKey)
         req.body.data = JSON.parse(utils.symetricDecrypt(req.body.data, decryptedKey))
-        logger.debug('Decrypted.', { body: req.body })
+        delete req.body.key
       } else {
         logger.error('Signature is not okay in decryptBody for %s.', req.body.signature.url)
         res.sendStatus(500)
diff --git a/middlewares/reqValidators/remote.js b/middlewares/reqValidators/remote.js
index 642dad1c7..a9d2cdf20 100644
--- a/middlewares/reqValidators/remote.js
+++ b/middlewares/reqValidators/remote.js
@@ -12,7 +12,7 @@
     req.checkBody('key', 'Should have a key').notEmpty()
     req.checkBody('data', 'Should have data').notEmpty()
 
-    logger.debug('Checking secureRequest parameters', { parameters: req.body })
+    logger.debug('Checking secureRequest parameters', { parameters: { data: req.body.data, keyLength: req.body.key.length } })
 
     checkErrors(req, res, next)
   }
diff --git a/src/pods.js b/src/pods.js
index 9afc6cc96..a0dbb6b68 100644
--- a/src/pods.js
+++ b/src/pods.js
@@ -97,7 +97,6 @@
         var pods_list = computeWinningPods(urls, pods_score)
         logger.debug('Pods that we keep computed.', { pods_to_keep: pods_list })
 
-        logger.debug('Make requests...')
         makeRequestsToWinningPods(cert, pods_list)
       })
     })
diff --git a/src/poolRequests.js b/src/poolRequests.js
index ee6c0156e..391ed6ab2 100644
--- a/src/poolRequests.js
+++ b/src/poolRequests.js
@@ -74,7 +74,6 @@
   }
 
   function makePoolRequest (type, requests) {
-    logger.debug('Make pool requests scheduled.')
     PodsDB.find({}, { _id: 1, url: 1, publicKey: 1 }).exec(function (err, pods) {
       if (err) throw err
 
diff --git a/src/utils.js b/src/utils.js
index 4aa1fc55e..30edcd0e9 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -30,7 +30,7 @@
       }
     }
 
-    logger.debug('Sending informations to %s.', to_pod.url, { params: params })
+    logger.debug('Make retry requests to %s.', to_pod.url)
     // Default 10 but in tests we want to be faster
     var retries = utils.isTestInstance() ? 2 : 10
 
@@ -84,8 +84,6 @@
 
       // Add data with POST requst ?
       if (all_data.method === 'POST' && all_data.data) {
-        logger.debug('Make a POST request.')
-
         // Encrypt data ?
         if (all_data.encrypt === true) {
           var crt = ursa.createPublicKey(pod.publicKey)
@@ -109,7 +107,6 @@
           makeRetryRequest(params, url, pod, signature, callbackEachRetryRequest)
         }
       } else {
-        logger.debug('Make a GET/DELETE request')
         makeRetryRequest(params, url, pod, signature, callbackEachRetryRequest)
       }
     }, callback)
-- 
2.41.0