appview: move tx rollback logic out of db.UpsertProfile() #994

+1 -4

appview/db/profile.go

··· 131 131 } 132 132 133 133 func UpsertProfile(tx *sql.Tx, profile *models.Profile) error { 134 134 - defer tx.Rollback() 135 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 231 - 232 232 - return tx.Commit() 229 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

··· 347 347 if err != nil { 348 348 return fmt.Errorf("failed to start transaction") 349 349 } 350 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 358 + if err != nil { 359 359 + return fmt.Errorf("upserting profile: %w", err) 360 360 + } 361 361 + 362 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

··· 613 613 s.pages.Notice(w, "update-profile", "Failed to update profile, try again later.") 614 614 return 615 615 } 616 616 + defer tx.Rollback() 617 617 + 618 618 + err = db.UpsertProfile(tx, profile) 619 619 + if err != nil { 620 620 + log.Println("failed to update profile", err) 621 621 + s.pages.Notice(w, "update-profile", "Failed to update profile, try again later.") 622 622 + return 623 623 + } 616 624 617 625 client, err := s.oauth.AuthorizedClient(r) 618 626 if err != nil { ··· 661 669 return 662 670 } 663 671 664 664 - err = db.UpsertProfile(tx, profile) 665 665 - if err != nil { 666 666 - log.Println("failed to update profile", err) 667 667 - s.pages.Notice(w, "update-profile", "Failed to update profile, try again later.") 668 668 - return 672 672 + if err := tx.Commit(); err != nil { 673 673 + s.logger.Error("failed to commit transaction", "err", err) 674 674 + // db failed, but PDS operation succeed. 675 675 + // log error and continue 669 676 } 670 677 671 678 s.notifier.UpdateProfile(r.Context(), profile)