From 8425cb894d4867d26fd5f7fae7862b0669f3c717 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Fri, 5 Feb 2016 19:02:05 +0100
Subject: Error handling mini refractoring

---
 helpers/peertubeCrypto.js | 12 ++++--------
 helpers/utils.js          |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'helpers')

diff --git a/helpers/peertubeCrypto.js b/helpers/peertubeCrypto.js
index 3e757659b..36271dba9 100644
--- a/helpers/peertubeCrypto.js
+++ b/helpers/peertubeCrypto.js
@@ -101,7 +101,7 @@
       logger.info('Generating a RSA key...')
       openssl.exec('genrsa', { 'out': certDir + 'peertube.key.pem', '2048': false }, function (err) {
         if (err) {
-          logger.error('Cannot create private key on this pod.', { error: err })
+          logger.error('Cannot create private key on this pod.')
           return callback(err)
         }
         logger.info('RSA key generated.')
@@ -109,7 +109,7 @@
         logger.info('Manage public key...')
         openssl.exec('rsa', { 'in': certDir + 'peertube.key.pem', 'pubout': true, 'out': certDir + 'peertube.pub' }, function (err) {
           if (err) {
-            logger.error('Cannot create public key on this pod .', { error: err })
+            logger.error('Cannot create public key on this pod.')
             return callback(err)
           }
 
@@ -122,9 +122,7 @@
 
   function generatePassword (callback) {
     crypto.randomBytes(32, function (err, buf) {
-      if (err) {
-        return callback(err)
-      }
+      if (err) return callback(err)
 
       callback(null, buf.toString('utf8'))
     })
@@ -139,9 +137,7 @@
 
   function symetricEncrypt (text, callback) {
     generatePassword(function (err, password) {
-      if (err) {
-        return callback(err)
-      }
+      if (err) return callback(err)
 
       var cipher = crypto.createCipher(algorithm, password)
       var crypted = cipher.update(text, 'utf8', 'hex')
diff --git a/helpers/utils.js b/helpers/utils.js
index bd0557977..92684ea81 100644
--- a/helpers/utils.js
+++ b/helpers/utils.js
@@ -8,7 +8,7 @@
   }
 
   function cleanForExit (webtorrent_process) {
-    logger.info('Gracefully exiting')
+    logger.info('Gracefully exiting.')
     process.kill(-webtorrent_process.pid)
   }
 
-- 
cgit v1.2.3