mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-12-30 12:20:33 +00: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>
65 lines
1.5 KiB
Go
65 lines
1.5 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 exec
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/woodpecker-ci/woodpecker/pipeline/rpc"
|
|
)
|
|
|
|
// LineWriter sends logs to the client.
|
|
type LineWriter struct {
|
|
stepName string
|
|
stepUUID string
|
|
num int
|
|
now time.Time
|
|
rep *strings.Replacer
|
|
lines []*rpc.LogEntry
|
|
}
|
|
|
|
// NewLineWriter returns a new line reader.
|
|
func NewLineWriter(stepName, stepUUID string) *LineWriter {
|
|
return &LineWriter{
|
|
stepName: stepName,
|
|
stepUUID: stepUUID,
|
|
now: time.Now().UTC(),
|
|
}
|
|
}
|
|
|
|
func (w *LineWriter) Write(p []byte) (n int, err error) {
|
|
data := string(p)
|
|
if w.rep != nil {
|
|
data = w.rep.Replace(data)
|
|
}
|
|
|
|
line := &rpc.LogEntry{
|
|
Data: data,
|
|
StepUUID: w.stepUUID,
|
|
Line: w.num,
|
|
Time: int64(time.Since(w.now).Seconds()),
|
|
Type: rpc.LogEntryStdout,
|
|
}
|
|
|
|
fmt.Fprintf(os.Stderr, "[%s:L%d:%ds] %s", w.stepName, w.num, int64(time.Since(w.now).Seconds()), data)
|
|
|
|
w.num++
|
|
|
|
w.lines = append(w.lines, line)
|
|
return len(p), nil
|
|
}
|