diff --git a/app/src/assets/admin/logger.less b/app/src/assets/admin/logger.less index a4e986f..cdc89e0 100644 --- a/app/src/assets/admin/logger.less +++ b/app/src/assets/admin/logger.less @@ -62,6 +62,7 @@ overflow-y: auto; touch-action: pan-y; padding: 0.5rem; + white-space: pre-wrap !important; } .console-icon { diff --git a/connection/database.go b/connection/database.go index a4d178f..9ea1156 100644 --- a/connection/database.go +++ b/connection/database.go @@ -29,11 +29,11 @@ func ConnectMySQL() *sql.DB { viper.GetInt("mysql.port"), viper.GetString("mysql.db"), )) - if err != nil || db.Ping() != nil { + if pingErr := db.Ping(); err != nil || pingErr != nil { + errMsg := utils.Multi[string](err != nil, utils.GetError(err), utils.GetError(pingErr)) // err.Error() may contain nil pointer globals.Warn( fmt.Sprintf("[connection] failed to connect to mysql server: %s (message: %s), will retry in 5 seconds", - viper.GetString("mysql.host"), - utils.GetError(err), // err.Error() may contain nil pointer + viper.GetString("mysql.host"), errMsg, ), )