Simplify delay writer Close

Per https://codeberg.org/forgejo/forgejo/pulls/2983#issuecomment-1730756

(cherry picked from commit 6acedb973a)
This commit is contained in:
Gusted 2024-04-03 14:06:39 +02:00 committed by GitHub
parent 713ac6f5d5
commit 5fdadbfe08

View file

@ -139,11 +139,10 @@ func (d *delayWriter) WriteString(s string) (n int, err error) {
}
func (d *delayWriter) Close() error {
if d == nil {
return nil
if d.timer.Stop() {
d.buf = nil
}
stopped := d.timer.Stop()
if stopped || d.buf == nil {
if d.buf == nil {
return nil
}
_, err := d.internal.Write(d.buf.Bytes())