Address the PR Review

appium · Jul 4, 2019 · e22f3c8 · e22f3c8
1 parent 08ffc05
commit e22f3c8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/lib/device-log/ios-log.js b/lib/device-log/ios-log.js
@@ -8,7 +8,6 @@ class IOSLog extends EventEmitter {
   constructor () {
     super();
     this.logs = [];
-    this.logRow = '';
     this.logIdxSinceLastRequest = -1;
     this.maxBufferSize = MAX_LOG_ENTRIES_COUNT;
   }

diff --git a/lib/device-log/ios-simulator-log.js b/lib/device-log/ios-simulator-log.js
@@ -42,26 +42,27 @@ class IOSSimulatorLog extends IOSLog {
 
   async finishStartingLogCapture () {
     if (!this.proc) {
-      log.errorAndThrow('Could not capture device log');
+      log.errorAndThrow('Could not capture simulator log');
     }
     let firstLine = true;
+    let logRow = '';
     this.proc.on('output', (stdout, stderr) => {
       if (stdout) {
         if (firstLine) {
-          if (stdout.substr(-1, 1) === '\n') {
-            // don't store the first line of the log because it came before the sim or device was launched
+          if (stdout.endsWith('\n')) {
+            // don't store the first line of the log because it came before the sim was launched
             firstLine = false;
           }
         } else {
-          this.logRow += stdout;
-          if (stdout.substr(-1, 1) === '\n') {
-            this.onOutput();
-            this.logRow = '';
+          logRow += stdout;
+          if (stdout.endsWith('\n')) {
+            this.onOutput(logRow);
+            logRow = '';
           }
         }
       }
       if (stderr) {
-        this.onOutput('STDERR');
+        this.onOutput(logRow, 'STDERR');
       }
     });
 
@@ -102,8 +103,8 @@ class IOSSimulatorLog extends IOSLog {
     return this.proc && this.proc.isRunning;
   }
 
-  onOutput (prefix = '') {
-    const logs = this.logRow.split('\n');
+  onOutput (logRow, prefix = '') {
+    const logs = _.cloneDeep(logRow).split('\n');
     for (const logLine of logs) {
       if (!logLine) continue; // eslint-disable-line curly
       this.broadcast(logLine);