Changeset 3931 for branches/3.2/sources/HeuristicLab.Hive.Server/3.2/ServiceCallInterception.cs

Timestamp:

06/19/10 09:17:24 (14 years ago)

Author:

kgrading

Message:

added minor speedups and better transaction handling to the server (#828)

File:

• branches/3.2/sources/HeuristicLab.Hive.Server/3.2/ServiceCallInterception.cs (modified) (5 diffs)

branches/3.2/sources/HeuristicLab.Hive.Server/3.2/ServiceCallInterception.cs

@@ -16 +16 @@
 
     public object Invoke(IMethodInvocation invocation) {
+      DateTime start = DateTime.Now;
       Logger.Info("Entering Method: " + invocation.Method.Name);
 
-      if(ContextFactory.Context != null) {
+      if(!ContextFactory.IsContextNull()) {
         Logger.Info("Not null context found - why wasn't this disposed?");
         try {
@@ -28 +29 @@
         ContextFactory.Context = null;
       }
-
+      Logger.Info("Context info: Timeout: " + ContextFactory.Context.Connection.ConnectionTimeout + " | " +
+                  ContextFactory.Context.Connection.State + " | Conn: " + ContextFactory.Context + " | HashCode is: " + ContextFactory.Context.Connection.GetHashCode());
       Object obj = null;
 
-      if (invocation.Method.Name.Equals("SendStreamedJob") || invocation.Method.Name.Equals("StoreFinishedJobResultStreamed")) {        
+      /*if (invocation.Method.Name.Equals("SendStreamedJob") || invocation.Method.Name.Equals("StoreFinishedJobResultStreamed")) {        
         ContextFactory.Context.Connection.Open();
         if(UseTransactions) {
@@ -48 +50 @@
           ContextFactory.Context = null;
         }        
-      } else {
+      } else { */
         if(UseTransactions) {
           using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
@@ -57 +59 @@
             }
             catch (Exception e) {
-              Logger.Error("Exception occured during method invocation", e);              
+              Logger.Error("Exception occured during method invocation", e);     
+              Logger.Error("Inner Exception: ", e.InnerException);
             }
             finally {
@@ -80 +83 @@
           }  
         }
+      //}       
+      TimeSpan ts = DateTime.Now - start;
+      if (ts.Seconds > 2) {
+        Logger.Warn("Invocation took: " + ts);
+      } else if (ts.Seconds > 10) {
+        Logger.Error("Invocation took: " + ts);
+      } else {
+        Logger.Info("Invocation took: " + ts); ;
       }
       Logger.Info("Leaving Method: " + invocation.Method.Name);
-
+      
       return obj;
     }