studio/flamenco
studio/flamenco
12
30
Fork 38
Code Issues 64 Pull Requests 5 Releases Wiki Activity

Sync branch magefile with main #104308

Merged
Sybren A. Stüvel merged 85 commits from abelli/flamenco:magefile into magefile 2024-05-13 16:26:32 +02:00
Conversation 0 Commits 85 Files Changed 145 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 94fba20ef6 - Show all commits

4
internal/worker/output_uploader.go
View File

@ -52,8 +52,8 @@ func (ou *OutputUploader) OutputProduced(taskID, filename string) {
} }
func (ou *OutputUploader) Run(ctx context.Context) { func (ou *OutputUploader) Run(ctx context.Context) {
log.Info().Msg("output uploader: running") log.Debug().Msg("output uploader: running")
defer log.Info().Msg("output uploader: shutting down") defer log.Debug().Msg("output uploader: shutting down")
wg := sync.WaitGroup{} wg := sync.WaitGroup{}
wg.Add(1) wg.Add(1)

2
internal/worker/upstream_buffer.go
View File

@ -133,7 +133,7 @@ func (ub *UpstreamBufferDB) Close() error {
ub.wg.Wait() ub.wg.Wait()
// Attempt one final flush, if it's fast enough: // Attempt one final flush, if it's fast enough:
log.Info().Msg("upstream buffer shutting down, doing one final flush") log.Debug().Msg("upstream buffer shutting down, doing one final flush")
flushCtx, ctxCancel := context.WithTimeout(context.Background(), flushOnShutdownTimeout) flushCtx, ctxCancel := context.WithTimeout(context.Background(), flushOnShutdownTimeout)
defer ctxCancel() defer ctxCancel()
if err := ub.Flush(flushCtx); err != nil { if err := ub.Flush(flushCtx); err != nil {