mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-11-24 08:02:18 +02:00
556607b525
closes #1801 closes #1815 closes #1144 closes #983 closes #557 closes #1827 regression of #1791 # TODO - [x] adjust log model - [x] add migration for logs - [x] send log line via grpc using step-id - [x] save log-line to db - [x] stream log-lines to UI - [x] use less structs for log-data - [x] make web UI work - [x] display logs loaded from db - [x] display streaming logs - [ ] ~~make migration work~~ -> dedicated pull (#1828) # TESTED - [x] new logs are stored in database - [x] log retrieval via cli (of new logs) works - [x] log streaming works (tested via curl & webui) - [x] log retrieval via web (of new logs) works --------- Co-authored-by: 6543 <6543@obermui.de>
68 lines
1.8 KiB
Go
68 lines
1.8 KiB
Go
// Copyright 2022 Woodpecker Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package agent
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"sync"
|
|
|
|
"github.com/rs/zerolog"
|
|
"github.com/rs/zerolog/log"
|
|
|
|
"github.com/woodpecker-ci/woodpecker/pipeline"
|
|
backend "github.com/woodpecker-ci/woodpecker/pipeline/backend/types"
|
|
"github.com/woodpecker-ci/woodpecker/pipeline/multipart"
|
|
"github.com/woodpecker-ci/woodpecker/pipeline/rpc"
|
|
)
|
|
|
|
func (r *Runner) createLogger(_ context.Context, logger zerolog.Logger, uploads *sync.WaitGroup, work *rpc.Pipeline) pipeline.LogFunc {
|
|
return func(step *backend.Step, rc multipart.Reader) error {
|
|
loglogger := logger.With().
|
|
Str("image", step.Image).
|
|
Str("stage", step.Alias).
|
|
Logger()
|
|
|
|
part, rerr := rc.NextPart()
|
|
if rerr != nil {
|
|
return rerr
|
|
}
|
|
uploads.Add(1)
|
|
|
|
var secrets []string
|
|
for _, secret := range work.Config.Secrets {
|
|
if secret.Mask {
|
|
secrets = append(secrets, secret.Value)
|
|
}
|
|
}
|
|
|
|
loglogger.Debug().Msg("log stream opened")
|
|
|
|
logStream := rpc.NewLineWriter(r.client, step.UUID, secrets...)
|
|
if _, err := io.Copy(logStream, part); err != nil {
|
|
log.Error().Err(err).Msg("copy limited logStream part")
|
|
}
|
|
|
|
loglogger.Debug().Msg("log stream copied")
|
|
|
|
defer func() {
|
|
loglogger.Debug().Msg("log stream closed")
|
|
uploads.Done()
|
|
}()
|
|
|
|
return nil
|
|
}
|
|
}
|