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.

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

Correct the logic for new log file detection. #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/rdstail.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func getMostRecentLogFile(r *rds.RDS, db string) (file *rds.DescribeDBLogFilesDe
return
}

// getMostRecentLogFileSince returns the most recent log file whose lastWritten >= since.
func getMostRecentLogFileSince(r *rds.RDS, db string, since int64) (file *rds.DescribeDBLogFilesDetails, err error) {
resp, err := describeLogFiles(r, db, since)
if err != nil {
Expand Down Expand Up @@ -156,7 +157,9 @@ func Watch(r *rds.RDS, db string, rate time.Duration, callback func(string) erro
if err != nil {
return err
}
if newLogFile != nil {
// Ensure if we got a real new log file, and not the same file we are
// already tailing. Reset the marker if its a real new log file only.
if newLogFile != nil && *newLogFile.LogFileName != *logFile.LogFileName {
logFile = newLogFile
marker = ""
}
Expand Down