diff --git a/.travis.yml b/.travis.yml index 209910cf..3504d496 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,8 @@ before_script: script: - set -e - if [[ $TRAVIS_TAG ]]; then go test -v -run=TestVersionMatchesTag ./server; fi -- if [[ ! $TRAVIS_TAG ]]; then go test -v -run=TestNoRace --failfast -p=1 ./...; fi -- if [[ ! $TRAVIS_TAG ]]; then if [[ "$TRAVIS_GO_VERSION" =~ 1.15 ]]; then ./scripts/cov.sh TRAVIS; else go test -v -race -p=1 --failfast ./...; fi; fi +- if [[ ! $TRAVIS_TAG ]]; then go test -v -run=TestNoRace --failfast -p=1 -timeout 20m ./...; fi +- if [[ ! $TRAVIS_TAG ]]; then if [[ "$TRAVIS_GO_VERSION" =~ 1.15 ]]; then ./scripts/cov.sh TRAVIS; else go test -v -race -p=1 --failfast -timeout 20m ./...; fi; fi - set +e deploy: diff --git a/server/filestore.go b/server/filestore.go index 16c098e8..4de4d0dc 100644 --- a/server/filestore.go +++ b/server/filestore.go @@ -3094,13 +3094,7 @@ func (mb *msgBlock) fetchMsg(seq uint64) (*fileStoredMsg, error) { if err := mb.loadMsgsWithLock(); err != nil { return nil, err } - - sm, err = mb.cacheLookup(seq) - if err == errNoCache { - fmt.Printf("NO CACHE [%d] FOR %d!!\n\n", mb.index, seq) - fmt.Printf("first %d, last %d\n", mb.first.seq, mb.last.seq) - } - return sm, err + return mb.cacheLookup(seq) } var (