From cb2fd72fd2066832c810623ce862a6c89b498ac5 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 16 Jan 2017 21:20:44 +0000 Subject: [PATCH] consistency for db errors --- .../library/sharedDatabaseInterface/src_oci/OciServer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/engine/shared/library/sharedDatabaseInterface/src_oci/OciServer.cpp b/engine/shared/library/sharedDatabaseInterface/src_oci/OciServer.cpp index ed5d8ddf..d8edb262 100755 --- a/engine/shared/library/sharedDatabaseInterface/src_oci/OciServer.cpp +++ b/engine/shared/library/sharedDatabaseInterface/src_oci/OciServer.cpp @@ -68,18 +68,17 @@ bool DB::OCIServer::checkerr(OCISession const & session, int status) WARNING(true,("Database error: %.*s",512,errbuf)); LOG("DatabaseError",("Database error: %.*s",512,errbuf)); - FATAL(DB::Server::getFatalOnError() || session.getFatalOnError(),("Database error: %.*s",512,errbuf)); switch ((int) errcode) { case 1013: - FATAL(true,("Cancelled by user request (ctrl-c or kill signal).\n")); + FATAL(DB::Server::getFatalOnError() || session.getFatalOnError(),("Cancelled by user request (ctrl-c or kill signal).\n")); break; case 12541: REPORT_LOG(true,("Database Error - %.*s\n", 512, errbuf)); return false; default: - FATAL(true,("Unhandled Database Error - %.*s\n", 512, errbuf)); + FATAL(DB::Server::getFatalOnError() || session.getFatalOnError(),("Unhandled Database Error - %.*s\n", 512, errbuf)); break; }