From 9264114895e6fb6a011fab91ba7962ec67985132 Mon Sep 17 00:00:00 2001 From: Abin Shahab Date: Tue, 14 Oct 2014 23:19:46 +0000 Subject: [PATCH] some more renames --- container/raw/container_hints.go | 2 +- container/raw/handler.go | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/container/raw/container_hints.go b/container/raw/container_hints.go index aa819b9c..c3d9221a 100644 --- a/container/raw/container_hints.go +++ b/container/raw/container_hints.go @@ -29,7 +29,7 @@ type containerHints struct { } type containerHint struct { - FullPath string `json:"full_path,omitempty"` + FullName string `json:"full_path,omitempty"` NetworkInterface *networkInterface `json:"network_interface,omitempty"` } diff --git a/container/raw/handler.go b/container/raw/handler.go index e0cbf062..c0dfb8a1 100644 --- a/container/raw/handler.go +++ b/container/raw/handler.go @@ -54,14 +54,11 @@ func newRawContainerHandler(name string, cgroupSubsystems *cgroupSubsystems, mac } cHints, err := getContainerHintsFromFile(*argContainerHints) if err != nil { - glog.Fatalf("Error unmarshalling json %s Error: %s", *argContainerHints, err) + return nil, err } var networkInterface *networkInterface for _, container := range cHints.AllHosts { - if !strings.Contains(container.FullPath, "/") { - glog.Fatalf("Invalid container fullPath %s", container.FullPath) - } - if name == container.FullPath { + if name == container.FullName { networkInterface = container.NetworkInterface break }