Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-14 07:55:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

make various handlers not error fatally

Browse Source
This commit is contained in:
wish
2023-02-04 22:14:30 +11:00
parent 09f2d138c0
commit bea4a8ad3a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/channelserver/handlers_guild_alliance.go
View File

@@ -73,7 +73,8 @@ func buildAllianceObjectFromDbResult(result *sqlx.Rows, err error, s *Session) (
parentGuild, err := GetGuildInfoByID(s, alliance.ParentGuildID) parentGuild, err := GetGuildInfoByID(s, alliance.ParentGuildID)
if err != nil { if err != nil {
s.logger.Fatal("Failed to get parent guild info", zap.Error(err)) s.logger.Error("Failed to get parent guild info", zap.Error(err))
return nil, err
} else { } else {
alliance.ParentGuild = *parentGuild alliance.ParentGuild = *parentGuild
alliance.TotalMembers += parentGuild.MemberCount alliance.TotalMembers += parentGuild.MemberCount
@@ -82,7 +83,8 @@ func buildAllianceObjectFromDbResult(result *sqlx.Rows, err error, s *Session) (
if alliance.SubGuild1ID > 0 { if alliance.SubGuild1ID > 0 {
subGuild1, err := GetGuildInfoByID(s, alliance.SubGuild1ID) subGuild1, err := GetGuildInfoByID(s, alliance.SubGuild1ID)
if err != nil { if err != nil {
s.logger.Fatal("Failed to get sub guild 1 info", zap.Error(err)) s.logger.Error("Failed to get sub guild 1 info", zap.Error(err))
return nil, err
} else { } else {
alliance.SubGuild1 = *subGuild1 alliance.SubGuild1 = *subGuild1
alliance.TotalMembers += subGuild1.MemberCount alliance.TotalMembers += subGuild1.MemberCount
@@ -92,7 +94,8 @@ func buildAllianceObjectFromDbResult(result *sqlx.Rows, err error, s *Session) (
if alliance.SubGuild2ID > 0 { if alliance.SubGuild2ID > 0 {
subGuild2, err := GetGuildInfoByID(s, alliance.SubGuild2ID) subGuild2, err := GetGuildInfoByID(s, alliance.SubGuild2ID)
if err != nil { if err != nil {
s.logger.Fatal("Failed to get sub guild 2 info", zap.Error(err)) s.logger.Error("Failed to get sub guild 2 info", zap.Error(err))
return nil, err
} else { } else {
alliance.SubGuild2 = *subGuild2 alliance.SubGuild2 = *subGuild2
alliance.TotalMembers += subGuild2.MemberCount alliance.TotalMembers += subGuild2.MemberCount