cfc65a13f6
This commit includes updates that affects the build, testing, and
deployment of Tile38.
- The root level build.sh has been broken up into multiple scripts
and placed in the "scripts" directory.
- The vendor directory has been updated to follow the Go modules
rules, thus `make` should work on isolated environments. Also
some vendored packages may have been updated to a later
version, if needed.
- The Makefile has been updated to allow for making single
binaries such as `make tile38-server`. There is some scaffolding
during the build process, so from now on all binaries should be
made using make. For example, to run a development version of
the tile38-cli binary, do this:
make tile38-cli && ./tile38-cli
not this:
go run cmd/tile38-cli/main.go
- Travis.CI docker push script has been updated to address a
change to Docker's JSON repo meta output, which in turn fixes
a bug where new Tile38 versions were not being properly pushed
to Docker
36 lines
1.2 KiB
Go
36 lines
1.2 KiB
Go
// Copyright 2018 Gary Burd
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
|
// not use this file except in compliance with the License. You may obtain
|
|
// a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
// License for the specific language governing permissions and limitations
|
|
// under the License.
|
|
|
|
// +build go1.7
|
|
|
|
package redis
|
|
|
|
import "context"
|
|
|
|
// GetContext gets a connection using the provided context.
|
|
//
|
|
// The provided Context must be non-nil. If the context expires before the
|
|
// connection is complete, an error is returned. Any expiration on the context
|
|
// will not affect the returned connection.
|
|
//
|
|
// If the function completes without error, then the application must close the
|
|
// returned connection.
|
|
func (p *Pool) GetContext(ctx context.Context) (Conn, error) {
|
|
pc, err := p.get(ctx)
|
|
if err != nil {
|
|
return errorConn{err}, err
|
|
}
|
|
return &activeConn{p: p, pc: pc}, nil
|
|
}
|