From 2e6b3da1d3466db379fef0d61a23e2878d17ee9d Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 27 Apr 2018 13:31:50 -0700 Subject: Fixing some merge conflicts with structured logging. (#8685) --- store/sqlstore/supplier.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'store/sqlstore/supplier.go') 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) } -- cgit v1.2.3-1-g7c22