summaryrefslogtreecommitdiff
path: root/internal/server/continuous.go
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2026-07-22 23:51:18 +0300
committerPaul Buetow <paul@buetow.org>2026-07-22 23:51:18 +0300
commit849951be1d1a7ee9f9302006ccb187bf5b4e36f3 (patch)
tree496c924a03a9ea6212e29bb4699e268066ebad81 /internal/server/continuous.go
parentbf78b3abffee6d49c08ca2980156afc455994969 (diff)
feat: DTail fork — server/client feature development
Squashed development of the snonux/dtail fork's product code (internal/, cmd/) since diverging from mimecast/dtail. Major areas: - Read/output path: the former "turbo" channel-less path is now the single, default server-side read/output path for cat/grep/tail and MapReduce; the old channel-based path and its config/env toggles were removed. - MapReduce: single aggregate implementation (server + serverless) fed directly by a processor pipeline, with input-exhausted finalization via the shutdown coordinator; high-concurrency and data-race fixes. - Journal source reads (journal:unit.service) via journalctl, Linux-gated behind a journal-v1 capability. - Auth-key fast reconnect: in-memory per-user public-key cache with TTL/max-keys, registered over an authenticated session (AUTHKEY), checked before authorized_keys. - Interactive query reload (--interactive-query) with SESSION START/UPDATE generation boundaries and capability negotiation. - Client-side deadlines: --timeout / --shutdownAfter as context deadlines; follow shutdown handling. - Client logging: diagnostics-only daily log by default, opt-in payload tee via --log-payload. - Numerous correctness fixes (buffer-pool double-recycle races, EOF-sentinel leaks, glob-expansion cap, TOCTOU in CSV parsing) with accompanying unit tests. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Diffstat (limited to 'internal/server/continuous.go')
-rw-r--r--internal/server/continuous.go61
1 files changed, 47 insertions, 14 deletions
diff --git a/internal/server/continuous.go b/internal/server/continuous.go
index ac5c686..f3ee4fa 100644
--- a/internal/server/continuous.go
+++ b/internal/server/continuous.go
@@ -13,10 +13,32 @@ import (
gossh "golang.org/x/crypto/ssh"
)
-type continuous struct{}
+type continuousClient interface {
+ Start(context.Context, <-chan string) int
+}
-func newContinuous() *continuous {
- return &continuous{}
+type continuous struct {
+ cfg config.RuntimeConfig
+ newMaprClient func(config.Args, clients.MaprClientMode) (continuousClient, error)
+ dayChangeWatcher func(context.Context) bool
+ retryInterval time.Duration
+ now func() time.Time
+ newTicker func(time.Duration) (<-chan time.Time, func())
+}
+
+func newContinuous(cfg config.RuntimeConfig) *continuous {
+ c := &continuous{cfg: cfg}
+ c.retryInterval = time.Minute
+ c.now = time.Now
+ c.newTicker = func(d time.Duration) (<-chan time.Time, func()) {
+ ticker := time.NewTicker(d)
+ return ticker.C, ticker.Stop
+ }
+ c.newMaprClient = func(args config.Args, mode clients.MaprClientMode) (continuousClient, error) {
+ return clients.NewMaprClient(args, mode)
+ }
+ c.dayChangeWatcher = c.waitForDayChange
+ return c
}
func (c *continuous) start(ctx context.Context) {
@@ -26,17 +48,20 @@ func (c *continuous) start(ctx context.Context) {
}
func (c *continuous) runJobs(ctx context.Context) {
- for _, job := range config.Server.Continuous {
+ for i := range c.cfg.Server.Continuous {
+ job := &c.cfg.Server.Continuous[i]
if !job.Enable {
dlog.Server.Debug(job.Name, "Not running job as not enabled")
continue
}
- go func(job config.Continuous) {
+ go func(job *config.Continuous) {
c.runJob(ctx, job)
+ retryTicker := time.NewTicker(c.retryInterval)
+ defer retryTicker.Stop()
for {
select {
- // Retry after a minute
- case <-time.After(time.Minute):
+ // Retry after the configured interval.
+ case <-retryTicker.C:
c.runJob(ctx, job)
case <-ctx.Done():
return
@@ -46,14 +71,14 @@ func (c *continuous) runJobs(ctx context.Context) {
}
}
-func (c *continuous) runJob(ctx context.Context, job config.Continuous) {
+func (c *continuous) runJob(ctx context.Context, job *config.Continuous) {
dlog.Server.Debug(job.Name, "Processing job")
files := fillDates(job.Files)
outfile := fillDates(job.Outfile)
servers := strings.Join(job.Servers, ",")
if servers == "" {
- servers = config.Server.SSHBindAddress
+ servers = c.cfg.Server.SSHBindAddress
}
args := config.Args{
@@ -67,7 +92,7 @@ func (c *continuous) runJob(ctx context.Context, job config.Continuous) {
args.SSHAuthMethods = append(args.SSHAuthMethods, gossh.Password(job.Name))
args.QueryStr = fmt.Sprintf("%s outfile %s", job.Query, outfile)
- client, err := clients.NewMaprClient(args, clients.NonCumulativeMode)
+ client, err := c.newMaprClient(args, clients.NonCumulativeMode)
if err != nil {
dlog.Server.Error(fmt.Sprintf("Unable to create job %s", job.Name), err)
return
@@ -77,7 +102,7 @@ func (c *continuous) runJob(ctx context.Context, job config.Continuous) {
defer cancel()
if job.RestartOnDayChange {
go func() {
- if c.waitForDayChange(ctx) {
+ if c.dayChangeWatcher(jobCtx) {
dlog.Server.Info(fmt.Sprintf("Canceling job %s due to day change", job.Name))
cancel()
}
@@ -95,11 +120,13 @@ func (c *continuous) runJob(ctx context.Context, job config.Continuous) {
}
func (c *continuous) waitForDayChange(ctx context.Context) bool {
- startTime := time.Now()
+ startTime := c.now()
+ tickCh, stop := c.newTicker(time.Second)
+ defer stop()
for {
select {
- case <-time.After(time.Second):
- if time.Now().Day() != startTime.Day() {
+ case <-tickCh:
+ if !sameCalendarDay(c.now(), startTime) {
return true
}
case <-ctx.Done():
@@ -107,3 +134,9 @@ func (c *continuous) waitForDayChange(ctx context.Context) bool {
}
}
}
+
+func sameCalendarDay(a, b time.Time) bool {
+ ay, am, ad := a.Date()
+ by, bm, bd := b.Date()
+ return ay == by && am == bm && ad == bd
+}