Wait until database is up | More logs

Author: m-kus

go.sum

@@ -115,8 +115,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
-github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
-github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=

hasura/hasura.go

@@ -23,9 +23,10 @@ const (
 func Create(hasura config.Hasura, cfg config.Database, views []string, models ...interface{}) error {
 	api := New(hasura.URL, hasura.Secret)
 
-	log.Info("Waiting hasura is up...")
+	log.Info("Waiting hasura is up and running")
 	for err := api.Health(); err != nil; err = api.Health() {
-		time.Sleep(time.Second * 10)
+		log.Warn(err)
+		time.Sleep(time.Second)
 	}
 
 	metadata, err := Generate(hasura, cfg, models...)
@@ -60,7 +61,7 @@ func Create(hasura config.Hasura, cfg config.Database, views []string, models ..
 		return err
 	}
 
-	if hasura.Rest == nil || *hasura.Rest {
+	if len(metadata.QueryCollections) > 0 && (hasura.Rest == nil || *hasura.Rest) {
 		log.Info("Creating REST endpoints...")
 		for _, query := range metadata.QueryCollections[0].Definition.Queries {
 			if err := api.CreateRestEndpoint(query.Name, query.Name, query.Name, allowedQueries); err != nil {

state/db.go

@@ -8,13 +8,28 @@ import (
 
 	"github.com/dipdup-net/go-lib/config"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 )
 
+// CheckConnection
+func CheckConnection(db *gorm.DB) error {
+	sql, err := db.DB()
+	if err != nil {
+		return err
+	}
+
+	if err = sql.Ping(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // OpenConnection -
 func OpenConnection(cfg config.Database) (*gorm.DB, error) {
 	var dialector gorm.Dialector
@@ -58,14 +73,10 @@ func OpenConnection(cfg config.Database) (*gorm.DB, error) {
 		return nil, err
 	}
 
-	sql, err := db.DB()
-	if err != nil {
-		return nil, err
-	}
-
-	if err = sql.Ping(); err != nil {
-		sql.Close()
-		return nil, err
+	logrus.Info("Waiting database is up and runnning")
+	for err := CheckConnection(db); err != nil; err = CheckConnection(db) {
+		logrus.Warn("%v", err)
+		time.Sleep(time.Second)
 	}
 
 	return db, nil

tzkt/api/api.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -59,7 +60,7 @@ func (tzkt *API) json(endpoint string, args map[string]string, output interface{
 		return json.NewDecoder(resp.Body).Decode(output)
 	}
 
-	return errors.New(resp.Status)
+	return errors.New(fmt.Sprintf("%s: %s %v", resp.Status, endpoint, args))
 }
 
 func (tzkt *API) count(endpoint string) (uint64, error) {