forked from
tangled.org/core
this repo has no description
appview: move tx rollback logic out of `db.UpsertProfile()`
Signed-off-by: Seongmin Lee <git@boltless.me>
+19
-9
+1
-4
appview/db/profile.go
+1
-4
appview/db/profile.go
···
131
131
}
132
132
133
133
func UpsertProfile(tx *sql.Tx, profile *models.Profile) error {
134
-
defer tx.Rollback()
135
-
136
134
// update links
137
135
_, err := tx.Exec(`delete from profile_links where did = ?`, profile.Did)
138
136
if err != nil {
···
228
226
return err
229
227
}
230
228
}
231
-
232
-
return tx.Commit()
229
+
return nil
233
230
}
234
231
235
232
func GetProfiles(e Execer, filters ...orm.Filter) (map[string]*models.Profile, error) {
+6
appview/ingester.go
+6
appview/ingester.go
···
347
347
if err != nil {
348
348
return fmt.Errorf("failed to start transaction")
349
349
}
350
+
defer tx.Rollback()
350
351
351
352
err = db.ValidateProfile(tx, &profile)
352
353
if err != nil {
···
354
355
}
355
356
356
357
err = db.UpsertProfile(tx, &profile)
358
+
if err != nil {
359
+
return fmt.Errorf("upserting profile: %w", err)
360
+
}
361
+
362
+
err = tx.Commit()
357
363
case jmodels.CommitOperationDelete:
358
364
err = db.DeleteArtifact(i.Db, orm.FilterEq("did", did), orm.FilterEq("rkey", e.Commit.RKey))
359
365
}
+12
-5
appview/state/profile.go
+12
-5
appview/state/profile.go
···
661
661
s.pages.Notice(w, "update-profile", "Failed to update profile, try again later.")
662
662
return
663
663
}
664
+
defer tx.Rollback()
665
+
666
+
err = db.UpsertProfile(tx, profile)
667
+
if err != nil {
668
+
log.Println("failed to update profile", err)
669
+
s.pages.Notice(w, "update-profile", "Failed to update profile, try again later.")
670
+
return
671
+
}
664
672
665
673
client, err := s.oauth.AuthorizedClient(r)
666
674
if err != nil {
···
709
717
return
710
718
}
711
719
712
-
err = db.UpsertProfile(tx, profile)
713
-
if err != nil {
714
-
log.Println("failed to update profile", err)
715
-
s.pages.Notice(w, "update-profile", "Failed to update profile, try again later.")
716
-
return
720
+
if err := tx.Commit(); err != nil {
721
+
s.logger.Error("failed to commit transaction", "err", err)
722
+
// db failed, but PDS operation succeed.
723
+
// log error and continue
717
724
}
718
725
719
726
s.notifier.UpdateProfile(r.Context(), profile)