diff --git a/lib/common b/lib/common index 604a1ddccd..2287fd9efa 160000 --- a/lib/common +++ b/lib/common @@ -1 +1 @@ -Subproject commit 604a1ddccd6e3bcc3e8beb4dee0d658e99bc2bdd +Subproject commit 2287fd9efa56ee985d720d49f8aef4e7cd362da2 diff --git a/lib/services/ios-log-filter.ts b/lib/services/ios-log-filter.ts index 55aed86a16..713122e1ea 100644 --- a/lib/services/ios-log-filter.ts +++ b/lib/services/ios-log-filter.ts @@ -4,7 +4,7 @@ import { cache } from "../common/decorators"; import * as iOSLogFilterBase from "../common/mobile/ios/ios-log-filter"; export class IOSLogFilter extends iOSLogFilterBase.IOSLogFilter implements Mobile.IPlatformLogFilter { - protected infoFilterRegex = /^.*?(:.*?(((?:CONSOLE|JS) (?:LOG|ERROR)).*?))$/im; + protected infoFilterRegex = /^.*?((?::)?.*?(((?:CONSOLE|JS) (?:LOG|ERROR)).*?))$/im; private partialLine: string = null; diff --git a/test/services/ios-log-filter.ts b/test/services/ios-log-filter.ts index c8e2588275..eba20f5ffe 100644 --- a/test/services/ios-log-filter.ts +++ b/test/services/ios-log-filter.ts @@ -32,6 +32,7 @@ describe("iOSLogFilter", () => { "May 24 14:44:59 iPad-90 mobile_installation_proxy[355] : 0x1f197000 LoadInfoPlist: Failed to create CFBundle from URL file:///private/var/mobile/Containers/Bundle/Application/0DA02818-DCAE-407C-979D-D55F4F36F8D2/NativeScript300.app", " May 24 14:44:59 iPad-90 mobile_installation_proxy[355] : 0x1f197000 LoadInfoPlist: Failed to create CFBundle from URL file:///private/var/mobile/Containers/Bundle/Application/B0EE9362-7BDD-4FF2-868F-857B76D9D8D3/Cordova370.app", " May 24 14:44:59 iPad-90 NativeScript250[790] : CONSOLE ERROR file:///app/tns_modules/@angular/core/bundles/core.umd.js:3472:32: EXCEPTION: Uncaught (in promise): Error: CUSTOM EXCEPTION", + "Aug 22 10:59:20 MCSOFAPPBLD TestApp[52946]: CONSOLE LOG file:///app/home/home-view-model.js:6:20: CUSTOM CONSOLE LOG", "" ], infoExpectedArr: [ @@ -43,6 +44,7 @@ describe("iOSLogFilter", () => { null, null, "CONSOLE ERROR file:///app/tns_modules/@angular/core/bundles/core.umd.js:3472:32: EXCEPTION: Uncaught (in promise): Error: CUSTOM EXCEPTION", + "CONSOLE LOG file:///app/home/home-view-model.js:6:20: CUSTOM CONSOLE LOG", "" ] }, @@ -65,6 +67,7 @@ describe("iOSLogFilter", () => { "UIApplicationMain@[native code]", "start@file:///app/tns_modules/tns-core-modules/application/application.js:251:26", "bootstrapApp@file:///app/tns_module", + "Aug 22 10:59:20 MCSOFAPPBLD TestApp[52946]: CONSOLE LOG file:///app/home/home-view-model.js:6:20: CUSTOM CONSOLE LOG", "" ], infoExpectedArr: [ @@ -84,6 +87,7 @@ describe("iOSLogFilter", () => { null, null, null, + "CONSOLE LOG file:///app/home/home-view-model.js:6:20: CUSTOM CONSOLE LOG", "" ] }