Fix imports
This commit is contained in:
parent
d9f4dcdb25
commit
2403cad5eb
12
Dockerfile
12
Dockerfile
|
@ -1,17 +1,17 @@
|
||||||
FROM golang
|
FROM golang
|
||||||
|
|
||||||
RUN mkdir -p $GOPATH/src/github.com/ActiveState/tail/
|
RUN mkdir -p $GOPATH/src/github.com/hpcloud/tail/
|
||||||
ADD . $GOPATH/src/github.com/ActiveState/tail/
|
ADD . $GOPATH/src/github.com/hpcloud/tail/
|
||||||
|
|
||||||
# expecting to fetch dependencies successfully.
|
# expecting to fetch dependencies successfully.
|
||||||
RUN go get -v github.com/ActiveState/tail
|
RUN go get -v github.com/hpcloud/tail
|
||||||
|
|
||||||
# expecting to run the test successfully.
|
# expecting to run the test successfully.
|
||||||
RUN go test -v github.com/ActiveState/tail
|
RUN go test -v github.com/hpcloud/tail
|
||||||
|
|
||||||
# expecting to install successfully
|
# expecting to install successfully
|
||||||
RUN go install -v github.com/ActiveState/tail
|
RUN go install -v github.com/hpcloud/tail
|
||||||
RUN go install -v github.com/ActiveState/tail/cmd/gotail
|
RUN go install -v github.com/hpcloud/tail/cmd/gotail
|
||||||
|
|
||||||
RUN $GOPATH/bin/gotail -h || true
|
RUN $GOPATH/bin/gotail -h || true
|
||||||
|
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -8,4 +8,4 @@ fmt:
|
||||||
|
|
||||||
# Run the test in an isolated environment.
|
# Run the test in an isolated environment.
|
||||||
fulltest:
|
fulltest:
|
||||||
docker build -t activestate/tail .
|
docker build -t hpcloud/tail .
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[![Build Status](https://travis-ci.org/ActiveState/tail.svg)](https://travis-ci.org/ActiveState/tail)
|
[![Build Status](https://travis-ci.org/hpcloud/tail.svg)](https://travis-ci.org/ActiveState/tail)
|
||||||
|
|
||||||
# Go package for tail-ing files
|
# Go package for tail-ing files
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ for line := range t.Lines {
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
See [API documentation](http://godoc.org/github.com/ActiveState/tail).
|
See [API documentation](http://godoc.org/github.com/hpcloud/tail).
|
||||||
|
|
||||||
## Log rotation
|
## Log rotation
|
||||||
|
|
||||||
|
@ -20,8 +20,8 @@ designed to work with log rotation tools.
|
||||||
|
|
||||||
## Installing
|
## Installing
|
||||||
|
|
||||||
go get github.com/ActiveState/tail/...
|
go get github.com/hpcloud/tail/...
|
||||||
|
|
||||||
## Windows support
|
## Windows support
|
||||||
|
|
||||||
This package [needs assistance](https://github.com/ActiveState/tail/labels/Windows) for full Windows support.
|
This package [needs assistance](https://github.com/hpcloud/tail/labels/Windows) for full Windows support.
|
||||||
|
|
|
@ -5,7 +5,7 @@ package main
|
||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/ActiveState/tail"
|
"github.com/hpcloud/tail"
|
||||||
"os"
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
6
tail.go
6
tail.go
|
@ -12,9 +12,9 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/ActiveState/tail/ratelimiter"
|
"github.com/hpcloud/tail/ratelimiter"
|
||||||
"github.com/ActiveState/tail/util"
|
"github.com/hpcloud/tail/util"
|
||||||
"github.com/ActiveState/tail/watch"
|
"github.com/hpcloud/tail/watch"
|
||||||
"gopkg.in/tomb.v1"
|
"gopkg.in/tomb.v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"./watch"
|
"./watch"
|
||||||
"github.com/ActiveState/tail/ratelimiter"
|
"github.com/hpcloud/tail/ratelimiter"
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
package tail
|
package tail
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/ActiveState/tail/winfile"
|
"github.com/hpcloud/tail/winfile"
|
||||||
"os"
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/ActiveState/tail/util"
|
"github.com/hpcloud/tail/util"
|
||||||
"gopkg.in/fsnotify.v0"
|
"gopkg.in/fsnotify.v0"
|
||||||
"gopkg.in/tomb.v1"
|
"gopkg.in/tomb.v1"
|
||||||
)
|
)
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
package watch
|
package watch
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/ActiveState/tail/util"
|
"github.com/hpcloud/tail/util"
|
||||||
"gopkg.in/tomb.v1"
|
"gopkg.in/tomb.v1"
|
||||||
"os"
|
"os"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
@ -63,7 +63,7 @@ func (fw *PollingFileWatcher) ChangeEvents(t *tomb.Tomb, origFi os.FileInfo) *Fi
|
||||||
time.Sleep(POLL_DURATION)
|
time.Sleep(POLL_DURATION)
|
||||||
fi, err := os.Stat(fw.Filename)
|
fi, err := os.Stat(fw.Filename)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Windows cannot delete a file if a handle is still open (tail keeps one open)
|
// Windows cannot delete a file if a handle is still open (tail keeps one open)
|
||||||
// so it gives access denied to anything trying to read it until all handles are released.
|
// so it gives access denied to anything trying to read it until all handles are released.
|
||||||
if os.IsNotExist(err) || (runtime.GOOS == "windows" && os.IsPermission(err)) {
|
if os.IsNotExist(err) || (runtime.GOOS == "windows" && os.IsPermission(err)) {
|
||||||
// File does not exist (has been deleted).
|
// File does not exist (has been deleted).
|
||||||
|
|
Loading…
Reference in New Issue