Skip to content

Add a tail-end flag #76

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add a tail-end flag #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions dockerize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ var (
urls []url.URL
waitFlag hostFlagsVar
waitTimeoutFlag time.Duration
tailEndFlag bool
dependencyChan chan struct{}

ctx context.Context
Expand Down Expand Up @@ -180,6 +181,7 @@ func main() {
flag.Var(&headersFlag, "wait-http-header", "HTTP headers, colon separated. e.g \"Accept-Encoding: gzip\". Can be passed multiple times")
flag.Var(&waitFlag, "wait", "Host (tcp/tcp4/tcp6/http/https/unix) to wait for before this container starts. Can be passed multiple times. e.g. tcp://db:5432")
flag.DurationVar(&waitTimeoutFlag, "timeout", 10*time.Second, "Host wait timeout")
flag.BoolVar(&tailEndFlag, "tail-end", false, "Follow stderr and stdout from end of file")

flag.Usage = usage
flag.Parse()
Expand Down Expand Up @@ -261,12 +263,12 @@ func main() {

for _, out := range stdoutTailFlag {
wg.Add(1)
go tailFile(ctx, out, poll, os.Stdout)
go tailFile(ctx, out, poll, os.Stdout, tailEndFlag)
}

for _, err := range stderrTailFlag {
wg.Add(1)
go tailFile(ctx, err, poll, os.Stderr)
go tailFile(ctx, err, poll, os.Stderr, tailEndFlag)
}

wg.Wait()
Expand Down
7 changes: 6 additions & 1 deletion tail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,18 @@ import (
"golang.org/x/net/context"
)

func tailFile(ctx context.Context, file string, poll bool, dest *os.File) {
func tailFile(ctx context.Context, file string, poll bool, dest *os.File, end bool) {
defer wg.Done()
seek := os.SEEK_SET
if end {
seek = os.SEEK_END
}
t, err := tail.TailFile(file, tail.Config{
Follow: true,
ReOpen: true,
Poll: poll,
Logger: tail.DiscardingLogger,
Location: &tail.SeekInfo{-0, seek},
})
if err != nil {
log.Fatalf("unable to tail %s: %s", "foo", err)
Expand Down