implab/ImplabNet Commit - r109:1b7ebcc52e5a

minor fixes

cin -

r109:1b7ebcc52e5a v2

parent child

Context file:

r109:1b7ebcc52e5a

Collapse all files

Implab/Diagnostics/ConsoleTraceListener.cs +1 -1

                          msg.AppendFormat("[{0}]:{1}: {2}", args.ThreadId, channel, text.content);
                          lock (_consoleLock) {
-                             Console.ForegroundColor = (ConsoleColor)(args.ThreadId % 15 + 1);
+                             //Console.ForegroundColor = (ConsoleColor)(args.ThreadId % 15 + 1);
                              Console.WriteLine(msg);
                          }
                      }

Implab/Diagnostics/Extensions.cs +19 -2

                          Safe.ArgumentNotNull(promise, "promise");
                          var op = TraceContext.Instance.DetachLogicalOperation();
-                         return promise.Anyway(() => {
+                         return promise.Then<T>(
+                              x => {
                              TraceContext.Instance.EnterLogicalOperation(op,true);
+                                 TraceLog.TraceInformation("promise = {0}", x);
                              TraceLog.EndLogicalOperation();
                              TraceContext.Instance.Leave();
-                         });
+                                 return x;
+                             },
+                             err =>{
+                                 TraceContext.Instance.EnterLogicalOperation(op,true);
+                                 TraceLog.TraceError("promise died {0}", err);
+                                 TraceLog.EndLogicalOperation();
+                                 TraceContext.Instance.Leave();
+                                 throw new TransientPromiseException(err);
+                             },
+                             () => {
+                                 TraceContext.Instance.EnterLogicalOperation(op,true);
+                                 TraceLog.TraceInformation("promise cancelled");
+                                 TraceLog.EndLogicalOperation();
+                                 TraceContext.Instance.Leave();
+                             }
+                         );
                      }
                      public static IPromise EndLogicalOperation(this IPromise promise) {

Implab/PromiseExtensions.cs +7 0

              using System.Threading;
              using System;
+             using Implab.Diagnostics;
              #if NET_4_5
              using System.Threading.Tasks;
              #endif
                      public static AsyncCallback AsyncCallback<T>(this Promise<T> that, Func<IAsyncResult,T> callback) {
                          Safe.ArgumentNotNull(that, "that");
                          Safe.ArgumentNotNull(callback, "callback");
+                         var op = TraceContext.Instance.CurrentOperation;
                          return ar => {
+                             TraceContext.Instance.EnterLogicalOperation(op,false);
                              try {
                                  that.Resolve(callback(ar));
                              } catch (Exception err) {
                                  that.Reject(err);
+                             } finally {
+                                 TraceContext.Instance.Leave();
                              }
                          };
                      }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages