Dump log synchronously if we are about to dispose of it.

caizikun · Nov 30, 2017 · b09e261 · b09e261
1 parent eb75291
commit b09e261
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Python/Product/Analysis/AnalysisLogWriter.cs b/Python/Product/Analysis/AnalysisLogWriter.cs
@@ -168,9 +168,14 @@ public void Flush(bool synchronous = false) {
         }
 
         private void Dump() {
-            if (!_dumping.Wait(0)) {
+            try {
+                if (!_dumping.Wait(0)) {
+                    return;
+                }
+            } catch (ObjectDisposedException) {
                 return;
             }
+
             try {
                 // Once triggered, allow any more immediate messages to be added.
                 Thread.Sleep(50);

diff --git a/Python/Product/Analysis/Interpreter/Ast/AstPythonInterpreterFactory.cs b/Python/Product/Analysis/Interpreter/Ast/AstPythonInterpreterFactory.cs
@@ -89,7 +89,7 @@ public void Dispose() {
         protected void Dispose(bool disposing) {
             if (!_disposed) {
                 _disposed = true;
-                _log?.Flush(!disposing);
+                _log?.Flush(synchronous: true);
 
                 if (disposing) {
                     if (_log != null) {