From f1dd9c6f3791636a54f25a3c7eb73eb6795a1b8e Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Thu, 16 Oct 2008 15:06:44 +0000
Subject: [PATCH] Add log message when a request starts evaluating, and make
 commit log message look nicer and easier to parse.

---
 src/helma/framework/core/RequestEvaluator.java | 18 +++++++++++-------
 src/helma/objectmodel/db/Transactor.java       | 13 +++++++++----
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/helma/framework/core/RequestEvaluator.java b/src/helma/framework/core/RequestEvaluator.java
index 232c3738..6bc2c27e 100644
--- a/src/helma/framework/core/RequestEvaluator.java
+++ b/src/helma/framework/core/RequestEvaluator.java
@@ -159,6 +159,9 @@ public final class RequestEvaluator implements Runnable {
                 // request path object
                 RequestPath requestPath = new RequestPath(app);
 
+                String txname = req.getMethod().toLowerCase() + ":" + req.getPath();
+                app.logEvent(txname + " starting");
+
                 int tries = 0;
                 boolean done = false;
                 Throwable error = null;
@@ -202,14 +205,14 @@ public final class RequestEvaluator implements Runnable {
                             throw new IllegalStateException("No function name in non-internal request ");
                         }
 
-                        // Transaction name is used for logging etc.
-                        StringBuffer txname = new StringBuffer(app.getName());
-                        txname.append(":").append(req.getMethod().toLowerCase()).append(":");
-                        txname.append((error == null) ? req.getPath() : "error");
+                        // Update transaction name in case we're processing an error
+                        if (error != null) {
+                            txname = txname + ":error";
+                        }
 
                         // begin transaction
                         transactor = Transactor.getInstance(app.nmgr);
-                        transactor.begin(txname.toString());
+                        transactor.begin(txname);
 
                         Object root = app.getDataRoot();
                         initGlobals(root, requestPath);
@@ -604,7 +607,7 @@ public final class RequestEvaluator implements Runnable {
                             error = x;
 
                             Transactor tx = Transactor.getInstance();
-                            String txname = tx == null ? "no-txn" : tx.getTransactionName();
+                            txname = tx == null ? "no-txn" : tx.getTransactionName();
                             app.logError(txname + ": " + error, x);
 
                             if (req.isXmlRpc()) {
@@ -624,8 +627,9 @@ public final class RequestEvaluator implements Runnable {
                     } finally {
                         app.setCurrentRequestEvaluator(null);
                         // exit execution context
-                        if (scriptingEngine != null)
+                        if (scriptingEngine != null) {
                             scriptingEngine.exitContext();
+                        }
                     }
                 }
 
diff --git a/src/helma/objectmodel/db/Transactor.java b/src/helma/objectmodel/db/Transactor.java
index 6785f720..b57265f9 100644
--- a/src/helma/objectmodel/db/Transactor.java
+++ b/src/helma/objectmodel/db/Transactor.java
@@ -419,10 +419,15 @@ public class Transactor {
             txn = null;
         }
 
-        nmgr.app.logAccess(tname + " " + inserted +
-                           " inserted, " + updated +
-                           " updated, " + deleted + " deleted in " +
-                           (now - tstart) + " millis");
+        StringBuffer msg = new StringBuffer(tname).append(" done in ")
+                .append(now - tstart).append(" millis");
+        if(inserted + updated + deleted > 0) {
+            msg.append(" [+")
+                    .append(inserted).append(", ~")
+                    .append(updated).append(", -")
+                    .append(deleted).append("]");
+        }
+        nmgr.app.logAccess(msg.toString());
 
         // unset transaction name
         tname = null;