09e8fb81b5
Instead of using a deque, store incoming messages in a native buffered channel, if buffering is enabled. In addition, modify the batching algorithm so the enforced delay between consecutive `addMessages` invocations is applied after all pending messages are processed. This acts as a "cooldown", rather than a "warmup". This avoids the need for more complex timing logic to dispatch batches, removes latency in adding messages when received infrequently, and natively blocking the goroutine until messages are received. Because the message processing loop always performs a blocking read first, it is appropriate for low-throughput environments just as much as high-throughput ones. The default value of batchSize has been changed to 10, with a zero cooldown. This means that when messages are arriving faster than they can be inserted into sqlite, they will automatically become batched in groups of up to 10.
47 lines
1.2 KiB
Go
47 lines
1.2 KiB
Go
package test
|
|
|
|
import (
|
|
"fmt"
|
|
"math/rand"
|
|
"net/http"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
"heckel.io/ntfy/server"
|
|
)
|
|
|
|
func init() {
|
|
rand.Seed(time.Now().UnixMilli())
|
|
}
|
|
|
|
// StartServer starts a server.Server with a random port and waits for the server to be up
|
|
func StartServer(t *testing.T) (*server.Server, int) {
|
|
return StartServerWithConfig(t, server.NewConfig())
|
|
}
|
|
|
|
// StartServerWithConfig starts a server.Server with a random port and waits for the server to be up
|
|
func StartServerWithConfig(t *testing.T, conf *server.Config) (*server.Server, int) {
|
|
port := 10000 + rand.Intn(20000)
|
|
conf.ListenHTTP = fmt.Sprintf(":%d", port)
|
|
conf.AttachmentCacheDir = t.TempDir()
|
|
conf.CacheBatchSize = 0
|
|
conf.CacheFile = filepath.Join(t.TempDir(), "cache.db")
|
|
s, err := server.New(conf)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
go func() {
|
|
if err := s.Run(); err != nil && err != http.ErrServerClosed {
|
|
panic(err) // 'go vet' complains about 't.Fatal(err)'
|
|
}
|
|
}()
|
|
WaitForPortUp(t, port)
|
|
return s, port
|
|
}
|
|
|
|
// StopServer stops the test server and waits for the port to be down
|
|
func StopServer(t *testing.T, s *server.Server, port int) {
|
|
s.Stop()
|
|
WaitForPortDown(t, port)
|
|
}
|