IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christopher Speller
2018-04-27 13:31:50 -07:00
committed by GitHub
parent 686c2fbab7
commit 2e6b3da1d3
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
store/sqlstore/supplier.go
View File

@@ -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)
}