Merge pull request #139 from bareos/dev/arogge/bareos-18.2/fix-631

catalog: make "Exit On Fatal" work as expected
bareos · Jan 31, 2019 · d8c0e6c · d8c0e6c
1 parent 031c7c8
commit d8c0e6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/cats/mysql.cc b/core/src/cats/mysql.cc
@@ -439,7 +439,7 @@ bool BareosDbMysql::SqlQueryWithHandler(const char *query, DB_RESULT_HANDLER *Re
          /*
           * Any fatal error should result in the daemon exiting.
           */
-         Emsg0(M_FATAL, 0, "Fatal database error\n");
+         Emsg0(M_ERROR_TERM, 0, "Fatal database error\n");
       }
 
       if (try_reconnect_ && !transaction_) {
@@ -560,7 +560,7 @@ bool BareosDbMysql::SqlQueryWithoutHandler(const char *query, int flags)
          /*
           * Any fatal error should result in the daemon exiting.
           */
-         Emsg0(M_FATAL, 0, "Fatal database error\n");
+         Emsg0(M_ERROR_TERM, 0, "Fatal database error\n");
       }
 
       if (try_reconnect_ && !transaction_) {

diff --git a/core/src/cats/postgresql.cc b/core/src/cats/postgresql.cc
@@ -689,7 +689,7 @@ bool BareosDbPostgresql::SqlQueryWithoutHandler(const char *query, int flags)
          /*
           * Any fatal error should result in the daemon exiting.
           */
-         Emsg0(M_FATAL, 0, "Fatal database error\n");
+         Emsg0(M_ERROR_TERM, 0, "Fatal database error\n");
       }
 
       if (try_reconnect_ && !transaction_) {