Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-26 01:23:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: replace panic calls with proper error handling

Browse Source 
Remove 51 panic() calls from handler code and replace with:
- Proper error logging using zap
- Appropriate client error responses (doAckBufFail, doAckSimpleFail)
- Graceful error recovery instead of server crashes

Files updated:
- handlers_guild_scout.go (9 panics)
- handlers_guild_tresure.go (10 panics)
- handlers_guild.go (7 panics + dead code removal)
- handlers_mail.go (5 panics)
- handlers.go (9 panics)
- handlers_tower.go (2 panics)
- handlers_clients.go (3 panics)
- handlers_guild_alliance.go (1 panic)
- handlers_quest.go (1 panic)
- handlers_rengoku.go (1 panic)
- handlers_stage.go (1 panic)
- handlers_data.go (1 panic)
- handlers_cafe.go (1 panic)
- signserver/sign_server.go (1 panic)

Remaining panics (3) are in test files and compression library
where panicking on programming errors is appropriate.
This commit is contained in:
Houmgaor
2026-02-02 17:14:34 +01:00
parent dbc3b21827
commit f138cb5f77
15 changed files with 203 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/channelserver/handlers_guild_scout.go
View File

@@ -15,8 +15,9 @@ func handleMsgMhfPostGuildScout(s *Session, p mhfpacket.MHFPacket) {
actorCharGuildData, err := GetCharacterGuildData(s, s.charID)
if err != nil {
s.logger.Error("failed to get character guild data", zap.Error(err), zap.Uint32("charID", s.charID))
doAckBufFail(s, pkt.AckHandle, make([]byte, 4))
panic(err)
return
}
if actorCharGuildData == nil || !actorCharGuildData.CanRecruit() {
@@ -27,15 +28,17 @@ func handleMsgMhfPostGuildScout(s *Session, p mhfpacket.MHFPacket) {
guildInfo, err := GetGuildInfoByID(s, actorCharGuildData.GuildID)
if err != nil {
s.logger.Error("failed to get guild info", zap.Error(err), zap.Uint32("guildID", actorCharGuildData.GuildID))
doAckBufFail(s, pkt.AckHandle, make([]byte, 4))
panic(err)
return
}
hasApplication, err := guildInfo.HasApplicationForCharID(s, pkt.CharID)
if err != nil {
s.logger.Error("failed to check application status", zap.Error(err), zap.Uint32("charID", pkt.CharID))
doAckBufFail(s, pkt.AckHandle, make([]byte, 4))
panic(err)
return
}
if hasApplication {
@@ -46,15 +49,18 @@ func handleMsgMhfPostGuildScout(s *Session, p mhfpacket.MHFPacket) {
transaction, err := s.server.db.Begin()
if err != nil {
panic(err)
s.logger.Error("failed to begin transaction", zap.Error(err))
doAckBufFail(s, pkt.AckHandle, make([]byte, 4))
return
}
err = guildInfo.CreateApplication(s, pkt.CharID, GuildApplicationTypeInvited, transaction)
if err != nil {
s.logger.Error("failed to create guild application", zap.Error(err), zap.Uint32("charID", pkt.CharID))
rollbackTransaction(s, transaction)
doAckBufFail(s, pkt.AckHandle, nil)
panic(err)
return
}
mail := &Mail{
@@ -79,8 +85,9 @@ func handleMsgMhfPostGuildScout(s *Session, p mhfpacket.MHFPacket) {
err = transaction.Commit()
if err != nil {
s.logger.Error("failed to commit transaction", zap.Error(err))
doAckBufFail(s, pkt.AckHandle, nil)
panic(err)
return
}
doAckBufSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00})
@@ -92,7 +99,9 @@ func handleMsgMhfCancelGuildScout(s *Session, p mhfpacket.MHFPacket) {
guildCharData, err := GetCharacterGuildData(s, s.charID)
if err != nil {
panic(err)
s.logger.Error("failed to get character guild data", zap.Error(err), zap.Uint32("charID", s.charID))
doAckBufFail(s, pkt.AckHandle, make([]byte, 4))
return
}
if guildCharData == nil || !guildCharData.CanRecruit() {
@@ -123,7 +132,11 @@ func handleMsgMhfAnswerGuildScout(s *Session, p mhfpacket.MHFPacket) {
guild, err := GetGuildInfoByCharacterId(s, pkt.LeaderID)
if err != nil {
panic(err)
s.logger.Error("failed to get guild info by character", zap.Error(err), zap.Uint32("leaderID", pkt.LeaderID))
bf.WriteUint32(7) // Error code
bf.WriteUint32(0)
doAckBufSucceed(s, pkt.AckHandle, bf.Data())
return
}
app, err := guild.GetApplicationForCharID(s, s.charID, GuildApplicationTypeInvited)
@@ -255,7 +268,9 @@ func handleMsgMhfGetGuildScoutList(s *Session, p mhfpacket.MHFPacket) {
_, err = bf.Seek(0, io.SeekStart)
if err != nil {
panic(err)
s.logger.Error("failed to seek in byte frame", zap.Error(err))
doAckBufFail(s, pkt.AckHandle, nil)
return
}
bf.WriteUint32(count)