Merge pull request #4461 from NativeScript/tachev/improve-simulator-logs

rosen-vladimirov · web-flow · commit 1f1cce0a7064 · 2019-03-21T06:30:42.000-07:00
fix: start iOS simulator logs before starting the app
diff --git a/lib/common/mobile/ios/simulator/ios-simulator-application-manager.ts b/lib/common/mobile/ios/simulator/ios-simulator-application-manager.ts
@@ -58,9 +58,10 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 			waitForDebugger: true,
 			args: "--nativescript-debug-brk",
 		} : {};
+		await this.setDeviceLogData(appData);
 		const launchResult = await this.iosSim.startApplication(this.device.deviceInfo.identifier, appData.appId, options);
 		const pid = getPidFromiOSSimulatorLogs(appData.appId, launchResult);
-		await this.setDeviceLogData(appData, pid);
+		this.$deviceLogProvider.setApplicationPidForDevice(this.device.deviceInfo.identifier, pid);
 		if (appData.waitForDebugger) {
 			this.attachNativeDebugger(appData.appId, pid);
 		}
@@ -114,8 +115,7 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 		}
 	}
 
-	private async setDeviceLogData(appData: Mobile.IApplicationData, pid: string): Promise<void> {
-		this.$deviceLogProvider.setApplicationPidForDevice(this.device.deviceInfo.identifier, pid);
+	private async setDeviceLogData(appData: Mobile.IApplicationData): Promise<void> {
 		this.$deviceLogProvider.setProjectNameForDevice(this.device.deviceInfo.identifier, appData.projectName);
 
 		if (!this.$options.justlaunch) {

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,10 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {`
`58`	`58`	`waitForDebugger: true,`
`59`	`59`	`args: "--nativescript-debug-brk",`
`60`	`60`	`} : {};`
	`61`	`+ await this.setDeviceLogData(appData);`
`61`	`62`	`const launchResult = await this.iosSim.startApplication(this.device.deviceInfo.identifier, appData.appId, options);`
`62`	`63`	`const pid = getPidFromiOSSimulatorLogs(appData.appId, launchResult);`
`63`		`- await this.setDeviceLogData(appData, pid);`
	`64`	`+ this.$deviceLogProvider.setApplicationPidForDevice(this.device.deviceInfo.identifier, pid);`
`64`	`65`	`if (appData.waitForDebugger) {`
`65`	`66`	`this.attachNativeDebugger(appData.appId, pid);`
`66`	`67`	`}`
`@@ -114,8 +115,7 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {`
`114`	`115`	`}`
`115`	`116`	`}`
`116`	`117`
`117`		`- private async setDeviceLogData(appData: Mobile.IApplicationData, pid: string): Promise<void> {`
`118`		`- this.$deviceLogProvider.setApplicationPidForDevice(this.device.deviceInfo.identifier, pid);`
	`118`	`+ private async setDeviceLogData(appData: Mobile.IApplicationData): Promise<void> {`
`119`	`119`	`this.$deviceLogProvider.setProjectNameForDevice(this.device.deviceInfo.identifier, appData.projectName);`
`120`	`120`
`121`	`121`	`if (!this.$options.justlaunch) {`