Fixing some merge conflicts with structured logging. (#8685)

2 files changed, 2 insertions, 10 deletions

diff --git a/i18n/en.json b/i18n/en.json
index c99d582f2..172ea47b1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5771,10 +5771,6 @@
     "translation": "Closing SqlStore"
   },
   {
-    "id": "store.sql.column_exists.critical",
-    "translation": "Failed to check if column exists %v"
-  },
-  {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "Failed to check if column exists because of missing driver"
   },
@@ -5863,10 +5859,6 @@
     "translation": "Failed to get data type for column %s from table %s: %v"
   },
   {
-    "id": "store.sql.table_exists.critical",
-    "translation": "Failed to check if table exists %v"
-  },
-  {
     "id": "store.sql.too_short_ciphertext",
     "translation": "ciphertext too short"
   },
diff --git a/store/sqlstore/supplier.go b/store/sqlstore/supplier.go
index 69b30be59..0b02d9d47 100644
--- a/store/sqlstore/supplier.go
+++ b/store/sqlstore/supplier.go
@@ -374,7 +374,7 @@ func (ss *SqlSupplier) DoesTableExist(tableName string) bool {
 		)
 
 		if err != nil {
-			l4g.Critical(utils.T("store.sql.table_exists.critical"), err)
+			mlog.Critical(fmt.Sprintf("Failed to check if table exists %v", err))
 			time.Sleep(time.Second)
 			os.Exit(EXIT_TABLE_EXISTS_SQLITE)
 		}
@@ -444,7 +444,7 @@ func (ss *SqlSupplier) DoesColumnExist(tableName string, columnName string) bool
 		)
 
 		if err != nil {
-			l4g.Critical(utils.T("store.sql.column_exists.critical"), err)
+			mlog.Critical(fmt.Sprintf("Failed to check if column exists %v", err))
 			time.Sleep(time.Second)
 			os.Exit(EXIT_DOES_COLUMN_EXISTS_SQLITE)
 		}