Merge pull request #629 from anyproto/go-2355-anytype-helper-crashed-…

…03517-beta GO-2355: Don't wait for slow services to close
anyproto · Nov 13, 2023 · 3752072 · 3752072
2 parents 977d1d2 + f1d3504
commit 3752072
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/core/filestorage/filesync/filesync.go b/core/filestorage/filesync/filesync.go
@@ -130,11 +130,15 @@ func (f *fileSync) Close(ctx context.Context) (err error) {
 	if f.loopCancel != nil {
 		f.loopCancel()
 	}
-	if closer, ok := f.rpcStore.(io.Closer); ok {
-		if err = closer.Close(); err != nil {
-			log.Error("can't close rpc store", zap.Error(err))
+	// Don't wait
+	go func() {
+		if closer, ok := f.rpcStore.(io.Closer); ok {
+			if err = closer.Close(); err != nil {
+				log.Error("can't close rpc store", zap.Error(err))
+			}
 		}
-	}
+	}()
+
 	return nil
 }
 

diff --git a/metrics/client.go b/metrics/client.go
@@ -182,7 +182,6 @@ func (c *client) startSendingBatchMessages() {
 		msgs := b.WaitMinMax(10, 100)
 		// if batcher is closed
 		if len(msgs) == 0 {
-			c.sendNextBatch(nil, b.GetAll())
 			close(c.closeChannel)
 			return
 		}