Fix few const and global variables

This commit is contained in:
Jonathan Calmels 2015-12-08 10:56:10 -08:00
parent b0796368fa
commit 97009e31a6
2 changed files with 11 additions and 7 deletions

View file

@ -11,7 +11,10 @@ import (
"graceful"
)
const sockName = "nvidia.sock"
const (
socketName = "nvidia.sock"
acceptHeader = "application/vnd.docker.plugins.v1.1+json"
)
type plugin interface {
implement() string
@ -25,10 +28,8 @@ type PluginAPI struct {
}
func accept(handler http.Handler) http.Handler {
const header = "application/vnd.docker.plugins.v1.1+json"
f := func(w http.ResponseWriter, r *http.Request) {
if r.Header.Get("Accept") != header {
if r.Header.Get("Accept") != acceptHeader {
w.WriteHeader(http.StatusNotAcceptable)
return
}
@ -41,7 +42,7 @@ func NewPluginAPI(prefix string) *PluginAPI {
os.MkdirAll(prefix, 0700)
a := &PluginAPI{
HTTPServer: graceful.NewHTTPServer("unix", path.Join(prefix, sockName), accept),
HTTPServer: graceful.NewHTTPServer("unix", path.Join(prefix, socketName), accept),
}
a.Handle("POST", "/Plugin.Activate", a.activate)

View file

@ -19,7 +19,10 @@ const (
szProcName = 64
)
var ErrCPUAffinity = errors.New("failed to retrieve CPU affinity")
var (
ErrCPUAffinity = errors.New("failed to retrieve CPU affinity")
ErrUnsupportedP2PLink = errors.New("unsupported P2P link type")
)
type P2PLinkType uint
@ -326,7 +329,7 @@ func GetP2PLink(dev1, dev2 *Device) (link P2PLinkType, err error) {
case C.NVML_TOPOLOGY_SYSTEM:
link = P2PLinkCrossCPU
default:
err = errors.New("unsupported P2P link type")
err = ErrUnsupportedP2PLink
}
return
}