Skip to content

Commit 7dab124

Browse files
committed
fix failing travis ci build
1 parent 31677d1 commit 7dab124

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: go
22

33
go:
4-
- 1.x
4+
- 1.9.3 # Cannot update to 1.9.4 until https://github.com/golang/go/issues/23739 is solved.
55

66
os:
77
- linux
@@ -17,6 +17,10 @@ before_install:
1717
- |
1818
set -e ;
1919
set -x ;
20+
if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
21+
# Workaround for broken OS X build, see https://github.com/travis-ci/travis-ci/issues/8703
22+
unset -f cd ;
23+
fi
2024
case "$ONIG_VERSION" in
2125
"DEFAULT")
2226
if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then

tailer/fileTailer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func runFileTailer(path string, readall bool, failOnMissingFile bool, logger sim
7171
closed: false,
7272
}
7373

74-
file, abspath, err := openLogfile(path, readall, failOnMissingFile)
74+
file, abspath, err := openLogfile(path, readall, failOnMissingFile) // file may be nil if failOnMissingFile is false and the file doesn't exist yet.
7575
if err != nil {
7676
go func(err error) {
7777
writeError(errors, done, "failed to initialize file system watcher for %v: %v", path, err)

0 commit comments

Comments
 (0)