coopgo-platform/agenda
7
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Remove fmt.Prinln and add Zerolog logging system
All checks were successful
Build and Push Docker Image / build_and_push (push) Successful in 1m51s
Details

Browse Source
This commit is contained in:
Arnaud Delcasse
2024-11-11 20:16:20 +01:00
parent 23c7b50d9b
commit 504702346a
7 changed files with 99 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
storage/postgresql.go
View File

@@ -11,6 +11,7 @@ import (
"ariga.io/atlas/sql/postgres"
"ariga.io/atlas/sql/schema"
"github.com/lib/pq"
"github.com/rs/zerolog/log"
"github.com/spf13/viper"
)
@@ -38,12 +39,12 @@ func NewPostgresqlStorage(cfg *viper.Viper) (PostgresqlStorage, error) {
user, password, dbname, sslmode, timezone)
db, err := sql.Open("postgres", psqlconn)
if err != nil {
fmt.Println("error", err)
log.Error().Err(err).Msg("erroropening postgresql connection")
return PostgresqlStorage{}, fmt.Errorf("connection to postgresql failed")
}
err = db.Ping()
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("error trying to reach postgresql server")
return PostgresqlStorage{}, fmt.Errorf("connection to postgresql database failed")
}
return PostgresqlStorage{
@@ -413,7 +414,7 @@ func (psql PostgresqlStorage) UpdateSubscription(eventid string, subscriber stri
subscriber,
)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return err
}
eventQuery := fmt.Sprintf(`
@@ -423,7 +424,7 @@ func (psql PostgresqlStorage) UpdateSubscription(eventid string, subscriber stri
`, psql.Tables["event"])
deletedSubscriptions, err := json.Marshal(deletesubscription)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return err
}
_, err = tx.Exec(
@@ -432,7 +433,7 @@ func (psql PostgresqlStorage) UpdateSubscription(eventid string, subscriber stri
eventid,
)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return err
}
@@ -482,7 +483,7 @@ func (psql PostgresqlStorage) GetSubscriber(subscriber string) ([]Subscription,
subscriptionQuery := fmt.Sprintf("SELECT id, event_id, subscriber, tags, created_at, data FROM %s WHERE subscriber = $1", psql.Tables["subscription"])
rows, err := psql.DbConnection.Query(subscriptionQuery, subscriber)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return nil, err
}
defer rows.Close()
@@ -499,14 +500,14 @@ func (psql PostgresqlStorage) GetSubscriber(subscriber string) ([]Subscription,
&dataSubscription,
)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return nil, err
}
subscription.Tags = []string(tags)
data := make(map[string]any)
err = json.Unmarshal(dataSubscription, &data)
if err != nil {
fmt.Println(err)
log.Error().Err(err).Msg("")
return nil, err
}
subscription.Data = data