Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: tail logs from end of log file #1339

Merged
merged 5 commits into from Sep 20, 2023
Merged

fix: tail logs from end of log file #1339

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6e34ec
tail from end of log file
tedim52 Sep 19, 2023
e2e67e9
rename tail logs to follow logs
tedim52 Sep 19, 2023
d2405fc
Merge branch 'main' into tedi/follow-logs
tedim52 Sep 20, 2023
22eb6cb
Merge branch 'main' into tedi/follow-logs
tedim52 Sep 20, 2023
54f047f
Merge branch 'main' into tedi/follow-logs
tedim52 Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions ...t_implementations/persistent_volume/stream_logs_strategy/per_week_stream_logs_strategy.go
View file
Open in desktop
Expand Up @@ -119,7 +119,7 @@ func (strategy *PerWeekStreamLogsStrategy) StreamLogs(
isLastLogLine = true
} else {
if shouldFollowLogs {
if err = strategy.tailLogs(latestLogFile, logsByKurtosisUserServiceUuidChan, serviceUuid, conjunctiveLogLinesFiltersWithRegex); err != nil {
if err = strategy.followLogs(latestLogFile, logsByKurtosisUserServiceUuidChan, serviceUuid, conjunctiveLogLinesFiltersWithRegex); err != nil {
streamErrChan <- stacktrace.Propagate(err, "An error occurred following logs for service '%v' in enclave '%v'.", serviceUuid, enclaveUuid)
return
}
Expand All @@ -142,7 +142,7 @@ func (strategy *PerWeekStreamLogsStrategy) StreamLogs(

if isLastLogLine {
if shouldFollowLogs {
if err = strategy.tailLogs(latestLogFile, logsByKurtosisUserServiceUuidChan, serviceUuid, conjunctiveLogLinesFiltersWithRegex); err != nil {
if err = strategy.followLogs(latestLogFile, logsByKurtosisUserServiceUuidChan, serviceUuid, conjunctiveLogLinesFiltersWithRegex); err != nil {
streamErrChan <- stacktrace.Propagate(err, "An error occurred following logs for service '%v' in enclave '%v'.", serviceUuid, enclaveUuid)
return
}
Expand Down Expand Up @@ -199,14 +199,17 @@ func (strategy *PerWeekStreamLogsStrategy) getRetainedLogsFilePaths(filesystem v
}

// tail -f [filepath]
func (strategy *PerWeekStreamLogsStrategy) tailLogs(
func (strategy *PerWeekStreamLogsStrategy) followLogs(
filepath string,
logsByKurtosisUserServiceUuidChan chan map[service.ServiceUUID][]logline.LogLine,
serviceUuid service.ServiceUUID,
conjunctiveLogLinesFiltersWithRegex []logline.LogLineFilterWithRegex,
) error {
logTail, err := tail.TailFile(filepath, tail.Config{
Location: nil,
Location: &tail.SeekInfo{
Offset: 0,
Whence: io.SeekEnd, // start tailing from end of log file
},
ReOpen: false,
MustExist: true,
Poll: false,
Expand Down