Skip to content

Commit ce46ec0

Browse files
committed
remove test panic
1 parent fa766ed commit ce46ec0

File tree

2 files changed

+23
-20
lines changed

2 files changed

+23
-20
lines changed

cluster.go

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -333,33 +333,37 @@ func (cr *Cluster) Disable(ctx context.Context) (ok bool) {
333333
{
334334
logInfo("Making keepalive before disable")
335335
tctx, cancel := context.WithTimeout(ctx, time.Second*10)
336-
cr.KeepAlive(tctx)
336+
ok = cr.KeepAlive(tctx)
337337
cancel()
338+
if ok {
339+
tctx, cancel := context.WithTimeout(ctx, time.Second*10)
340+
data, err := cr.socket.EmitAckContext(tctx, "disable")
341+
cancel()
342+
if err != nil {
343+
logErrorf("Disable failed: %v", err)
344+
ok = false
345+
} else {
346+
logDebug("disable ack:", data)
347+
if ero := data[0]; ero != nil {
348+
logErrorf("Disable failed: %v", ero)
349+
ok = false
350+
} else if !data[1].(bool) {
351+
logError("Disable failed: acked non true value")
352+
ok = false
353+
}
354+
}
355+
} else {
356+
logWarn("Keep alive failed, disable without send packet")
357+
ok = true
358+
}
338359
}
339360

340-
tctx, cancel := context.WithTimeout(ctx, time.Second*10)
341-
data, err := cr.socket.EmitAckContext(tctx, "disable")
342-
cancel()
343-
344361
cr.enabled.Store(false)
345362
go cr.socket.Close()
346363
cr.socket = nil
347364
close(cr.disabled)
348-
if err != nil {
349-
logErrorf("Disable failed: %v", err)
350-
return false
351-
}
352-
logDebug("disable ack:", data)
353-
if ero := data[0]; ero != nil {
354-
logErrorf("Disable failed: %v", ero)
355-
return false
356-
}
357-
if !data[1].(bool) {
358-
logError("Disable failed: ack non true value")
359-
return false
360-
}
361365
logWarn("Cluster disabled")
362-
return true
366+
return
363367
}
364368

365369
func (cr *Cluster) Disabled() <-chan struct{} {

logger.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,5 +139,4 @@ func startFlushLogFile() {
139139
}
140140
}
141141
}()
142-
panic("test panic")
143142
}

0 commit comments

Comments
 (0)