From fe48811047198e020d8cd6fa65d1b785431714fa Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Tue, 17 Nov 2015 16:24:07 +0100
Subject: [PATCH] Include user name in API logs.

---
 src/api.js   | 13 ++++++++-----
 src/index.js |  6 ------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/api.js b/src/api.js
index d489b2a36..fa6a285a3 100644
--- a/src/api.js
+++ b/src/api.js
@@ -211,9 +211,10 @@ export default class Api {
     // FIXME: too coupled with XO.
     // Fetch and inject the current user.
     const userId = session.get('user_id', undefined)
-    if (userId) {
-      context.user = await context._getUser(userId)
-    }
+    context.user = userId && await context._getUser(userId)
+    const userName = context.user
+      ? context.user.get('email')
+      : '(unknown user)'
 
     try {
       await checkPermission.call(context, method)
@@ -230,7 +231,8 @@ export default class Api {
       }
 
       debug(
-        '%s(...) [%s] ==> %s',
+        '%s | %s(...) [%s] ==> %s',
+        userName,
         name,
         ms(Date.now() - startTime),
         kindOf(result)
@@ -239,7 +241,8 @@ export default class Api {
       return result
     } catch (error) {
       debug(
-        '%s(...) [%s] =!> %s',
+        '%s | %s(...) [%s] =!> %s',
+        userName,
         name,
         ms(Date.now() - startTime),
         error
diff --git a/src/index.js b/src/index.js
index a3d61a0df..8c953f5e8 100644
--- a/src/index.js
+++ b/src/index.js
@@ -471,12 +471,6 @@ const setUpConsoleProxy = (webServer, xo) => {
       return
     }
 
-    const { remoteAddress } = socket
-    debug('+ Console proxy (%s)', remoteAddress)
-    socket.on('close', () => {
-      debug('- Console proxy (%s)', remoteAddress)
-    })
-
     const [, id] = matches
     try {
       // TODO: factorize permissions checking in an Express middleware.