diff --git a/lib/PuppeteerSharp/Browser.cs b/lib/PuppeteerSharp/Browser.cs index 5668fab3e..4afcd34db 100644 --- a/lib/PuppeteerSharp/Browser.cs +++ b/lib/PuppeteerSharp/Browser.cs @@ -46,6 +46,7 @@ internal Browser( Connection = connection; _closeCallback = closeCallback; _targetFilterCallback = targetFilter ?? ((TargetInfo _) => true); + _logger = Connection.LoggerFactory.CreateLogger(); _isPageTargetFunc = isPageTargetFunc ?? new Func((TargetInfo target) => @@ -75,8 +76,6 @@ internal Browser( CreateTarget, _targetFilterCallback); } - - _logger = Connection.LoggerFactory.CreateLogger(); } /// diff --git a/lib/PuppeteerSharp/ChromeTargetManager.cs b/lib/PuppeteerSharp/ChromeTargetManager.cs index b3252a40e..34df70484 100644 --- a/lib/PuppeteerSharp/ChromeTargetManager.cs +++ b/lib/PuppeteerSharp/ChromeTargetManager.cs @@ -33,9 +33,9 @@ public ChromeTargetManager( _connection = connection; _targetFilterFunc = targetFilterFunc; _targetFactoryFunc = targetFactoryFunc; + _logger = _connection.LoggerFactory.CreateLogger(); _connection.MessageReceived += OnMessageReceived; _connection.SessionDetached += Connection_SessionDetached; - _logger = _connection.LoggerFactory.CreateLogger(); _ = _connection.SendAsync("Target.setDiscoverTargets", new TargetSetDiscoverTargetsRequest { diff --git a/lib/PuppeteerSharp/FirefoxTargetManager.cs b/lib/PuppeteerSharp/FirefoxTargetManager.cs index 71f463c49..8051d25cf 100644 --- a/lib/PuppeteerSharp/FirefoxTargetManager.cs +++ b/lib/PuppeteerSharp/FirefoxTargetManager.cs @@ -1,4 +1,4 @@ -#pragma warning disable CS0067 // Temporal, do not merge with this +#pragma warning disable CS0067 // Temporal, do not merge with this using System; using System.Collections.Concurrent; using System.Collections.Generic; @@ -31,9 +31,9 @@ public FirefoxTargetManager( _connection = connection; _targetFilterFunc = targetFilterFunc; _targetFactoryFunc = targetFactoryFunc; + _logger = _connection.LoggerFactory.CreateLogger(); _connection.MessageReceived += OnMessageReceived; _connection.SessionDetached += Connection_SessionDetached; - _logger = _connection.LoggerFactory.CreateLogger(); } public event EventHandler TargetAvailable; @@ -191,4 +191,4 @@ private void FinishInitializationIfReady(string targetId = null) } } } -#pragma warning restore CS0067 \ No newline at end of file +#pragma warning restore CS0067 diff --git a/lib/PuppeteerSharp/IsolatedWorld.cs b/lib/PuppeteerSharp/IsolatedWorld.cs index 01cec406e..5ae188546 100644 --- a/lib/PuppeteerSharp/IsolatedWorld.cs +++ b/lib/PuppeteerSharp/IsolatedWorld.cs @@ -39,7 +39,7 @@ public IsolatedWorld( Frame frame, TimeoutSettings timeoutSettings) { - Logger = client.Connection.LoggerFactory.CreateLogger(); + _logger = client.Connection.LoggerFactory.CreateLogger(); _client = client; _frameManager = frameManager; _customQueriesManager = ((Browser)frameManager.Page.Browser).CustomQueriesManager; @@ -48,7 +48,6 @@ public IsolatedWorld( _detached = false; _client.MessageReceived += Client_MessageReceived; - _logger = _client.Connection.LoggerFactory.CreateLogger(); } internal TaskManager TaskManager { get; set; } = new(); @@ -57,8 +56,6 @@ public IsolatedWorld( internal bool HasContext => _contextResolveTaskWrapper?.Task.IsCompleted == true; - internal ILogger Logger { get; } - internal ConcurrentDictionary BoundFunctions { get; } = new(); internal TaskCompletionSource PuppeteerUtilTaskCompletionSource { get; private set; } = new(TaskCreationOptions.RunContinuationsAsynchronously); @@ -500,7 +497,7 @@ private async Task InjectPuppeteerUtil(ExecutionContext context) } catch (Exception ex) { - Logger.LogError(ex.ToString()); + _logger.LogError(ex.ToString()); } } @@ -518,7 +515,7 @@ private async void Client_MessageReceived(object sender, MessageEventArgs e) catch (Exception ex) { var message = $"IsolatedWorld failed to process {e.MessageID}. {ex.Message}. {ex.StackTrace}"; - Logger.LogError(ex, message); + _logger.LogError(ex, message); _client.Close(message); } } diff --git a/lib/PuppeteerSharp/NetworkManager.cs b/lib/PuppeteerSharp/NetworkManager.cs index 83eae3bdb..a52980b80 100644 --- a/lib/PuppeteerSharp/NetworkManager.cs +++ b/lib/PuppeteerSharp/NetworkManager.cs @@ -36,8 +36,8 @@ internal NetworkManager(CDPSession client, bool ignoreHTTPSErrors, FrameManager FrameManager = frameManager; _client = client; _ignoreHTTPSErrors = ignoreHTTPSErrors; - _client.MessageReceived += Client_MessageReceived; _logger = _client.Connection.LoggerFactory.CreateLogger(); + _client.MessageReceived += Client_MessageReceived; } internal event EventHandler Response;