From f8ded899695fc65026f309254d869c64b6118158 Mon Sep 17 00:00:00 2001 From: dimitr Date: Thu, 28 May 2009 07:58:39 +0000 Subject: [PATCH] Better error reporting. Also, don't block the requester in the case of error. --- src/jrd/DatabaseSnapshot.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/jrd/DatabaseSnapshot.cpp b/src/jrd/DatabaseSnapshot.cpp index fb886bb8d5..6ef6f5c3de 100644 --- a/src/jrd/DatabaseSnapshot.cpp +++ b/src/jrd/DatabaseSnapshot.cpp @@ -350,17 +350,19 @@ int DatabaseSnapshot::blockingAst(void* ast_object) if (!(dbb->dbb_ast_flags & DBB_monitor_off)) { - try { - // Write the data to the shared memory + // Write the data to the shared memory + try + { dumpData(tdbb); + } + catch (const Exception& ex) + { + iscLogException("Cannot dump the monitoring data", ex); + } - // Release the lock and mark dbb as requesting a new one - LCK_release(tdbb, lock); - dbb->dbb_ast_flags |= DBB_monitor_off; - } - catch (const Exception&) { - gds__log("Unexpected exception at the AST level"); - } + // Release the lock and mark dbb as requesting a new one + LCK_release(tdbb, lock); + dbb->dbb_ast_flags |= DBB_monitor_off; } } catch (const Exception&)