Merge pull request '[v7.0/forgejo] Simplify delay writer Close' (#3005) from bp-v7.0/forgejo-6acedb9 into v7.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3005 Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
This commit is contained in:
commit
0a086dffc0
1 changed files with 3 additions and 4 deletions
|
@ -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())
|
||||
|
|
Loading…
Reference in a new issue