From 2e6b3da1d3466db379fef0d61a23e2878d17ee9d Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 27 Apr 2018 13:31:50 -0700 Subject: [PATCH] Fixing some merge conflicts with structured logging. (#8685) --- i18n/en.json | 8 -------- store/sqlstore/supplier.go | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/i18n/en.json b/i18n/en.json index c99d582f28..172ea47b14 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5770,10 +5770,6 @@ "id": "store.sql.closing.info", "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" @@ -5862,10 +5858,6 @@ "id": "store.sql.table_column_type.critical", "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 69b30be59e..0b02d9d470 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) }