From 6589eb86c54bdead163a1874c5da6f6f3eef4d10 Mon Sep 17 00:00:00 2001
From: Michel Weststrate <mweststrate@fb.com>
Date: Thu, 14 Oct 2021 03:16:38 -0700
Subject: [PATCH] Improve port forwarding logging

Summary: Port forwarding tool was logging the child process object. Made the logging cleaner and more useful.

Reviewed By: nikoant

Differential Revision: D31608867

fbshipit-source-id: 1c2ae7c926ed4e1b44d51db5415874600acde7ae
---
 .../src/devices/ios/iOSDeviceManager.tsx       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/desktop/flipper-server-core/src/devices/ios/iOSDeviceManager.tsx b/desktop/flipper-server-core/src/devices/ios/iOSDeviceManager.tsx
index a10443445..5ea8bf48f 100644
--- a/desktop/flipper-server-core/src/devices/ios/iOSDeviceManager.tsx
+++ b/desktop/flipper-server-core/src/devices/ios/iOSDeviceManager.tsx
@@ -71,20 +71,26 @@ export class IOSDeviceManager {
       (err, stdout, stderr) => {
         // This happens on app reloads and doesn't need to be treated as an error.
         console.warn(
-          'Port forwarding app failed to start',
+          '[conn] Port forwarding app failed to start',
           err,
           stdout,
           stderr,
         );
       },
     );
-    console.log('Port forwarding app started', childProcess);
+    console.info(
+      `[conn] Port forwarding app started (portForward: ${port}, multiplexChannelPort: ${multiplexChannelPort})`,
+    );
     child.addListener('error', (err) =>
-      console.warn('Port forwarding app error', err),
-    );
-    child.addListener('exit', (code) =>
-      console.log(`Port forwarding app exited with code ${code}`),
+      console.warn('[conn] Port forwarding app error', err),
     );
+    child.addListener('exit', (code) => {
+      if (code != 0) {
+        console.warn(`[conn] Port forwarding app exited with code ${code}`);
+      } else {
+        console.log(`[conn] Port forwarding app exited gracefully`);
+      }
+    });
     return child;
   }