From 1223e28905537f5365eda14a40889c5ddcfd4409 Mon Sep 17 00:00:00 2001 From: Shirou WAKAYAMA Date: Fri, 7 Aug 2015 10:14:14 +0900 Subject: [PATCH] docker[linux]: change docker error valiable and add cgroup error. --- docker/docker.go | 3 ++- docker/docker_linux.go | 1 - docker/docker_notlinux.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/docker.go b/docker/docker.go index 5cd4c62..83a92be 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -2,7 +2,8 @@ package docker import "errors" -var ErrNotAvailable = errors.New("docker not available") +var ErrDockerNotAvailable = errors.New("docker not available") +var ErrCgroupNotAvailable = errors.New("cgroup not available") type CgroupMemStat struct { ContainerID string `json:"container_id"` diff --git a/docker/docker_linux.go b/docker/docker_linux.go index e148f22..1113e4c 100644 --- a/docker/docker_linux.go +++ b/docker/docker_linux.go @@ -4,7 +4,6 @@ package docker import ( "encoding/json" - "errors" "os/exec" "path" "strconv" diff --git a/docker/docker_notlinux.go b/docker/docker_notlinux.go index 628a856..ff2f5e0 100644 --- a/docker/docker_notlinux.go +++ b/docker/docker_notlinux.go @@ -12,7 +12,7 @@ import ( // GetDockerIDList returnes a list of DockerID. // This requires certain permission. func GetDockerIDList() ([]string, error) { - return nil, common.NotImplementedError + return nil, ErrDockerNotAvailable } // CgroupCPU returnes specified cgroup id CPU status. @@ -20,7 +20,7 @@ func GetDockerIDList() ([]string, error) { // If you use container via systemd.slice, you could use // containerid = docker-.scope and base=/sys/fs/cgroup/cpuacct/system.slice/ func CgroupCPU(containerid string, base string) (*cpu.CPUTimesStat, error) { - return nil, common.NotImplementedError + return nil, ErrCgroupNotAvailable } func CgroupCPUDocker(containerid string) (*cpu.CPUTimesStat, error) { @@ -28,7 +28,7 @@ func CgroupCPUDocker(containerid string) (*cpu.CPUTimesStat, error) { } func CgroupMem(containerid string, base string) (*CgroupMemStat, error) { - return nil, common.NotImplementedError + return nil, ErrCgroupNotAvailable } func CgroupMemDocker(containerid string) (*CgroupMemStat, error) {