vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

*: Failed -> failed in errors

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-09-18 11:08:29 +02:00
parent 5e672974ff
commit 59aae8cdb5
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cmd/client/main.go
View file

@ -29,7 +29,7 @@ func getClientConnection() (*grpc.ClientConn, error) {
return net.DialTimeout("unix", addr, timeout) return net.DialTimeout("unix", addr, timeout)
})) }))
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to connect: %v", err) return nil, fmt.Errorf("failed to connect: %v", err)
} }
return conn, nil return conn, nil
} }
@ -266,7 +266,7 @@ var pullImageCommand = cli.Command{
// Set up a connection to the server. // Set up a connection to the server.
conn, err := getClientConnection() conn, err := getClientConnection()
if err != nil { if err != nil {
return fmt.Errorf("Failed to connect: %v", err) return fmt.Errorf("failed to connect: %v", err)
} }
defer conn.Close() defer conn.Close()
client := pb.NewImageServiceClient(conn) client := pb.NewImageServiceClient(conn)
@ -286,7 +286,7 @@ var runtimeVersionCommand = cli.Command{
// Set up a connection to the server. // Set up a connection to the server.
conn, err := getClientConnection() conn, err := getClientConnection()
if err != nil { if err != nil {
return fmt.Errorf("Failed to connect: %v", err) return fmt.Errorf("failed to connect: %v", err)
} }
defer conn.Close() defer conn.Close()
client := pb.NewRuntimeServiceClient(conn) client := pb.NewRuntimeServiceClient(conn)
@ -325,7 +325,7 @@ var createPodSandboxCommand = cli.Command{
// Set up a connection to the server. // Set up a connection to the server.
conn, err := getClientConnection() conn, err := getClientConnection()
if err != nil { if err != nil {
return fmt.Errorf("Failed to connect: %v", err) return fmt.Errorf("failed to connect: %v", err)
} }
defer conn.Close() defer conn.Close()
client := pb.NewRuntimeServiceClient(conn) client := pb.NewRuntimeServiceClient(conn)
@ -353,7 +353,7 @@ var stopPodSandboxCommand = cli.Command{
// Set up a connection to the server. // Set up a connection to the server.
conn, err := getClientConnection() conn, err := getClientConnection()
if err != nil { if err != nil {
return fmt.Errorf("Failed to connect: %v", err) return fmt.Errorf("failed to connect: %v", err)
} }
defer conn.Close() defer conn.Close()
client := pb.NewRuntimeServiceClient(conn) client := pb.NewRuntimeServiceClient(conn)
@ -450,7 +450,7 @@ var createContainerCommand = cli.Command{
// Set up a connection to the server. // Set up a connection to the server.
conn, err := getClientConnection() conn, err := getClientConnection()
if err != nil { if err != nil {
return fmt.Errorf("Failed to connect: %v", err) return fmt.Errorf("failed to connect: %v", err)
} }
defer conn.Close() defer conn.Close()
client := pb.NewRuntimeServiceClient(conn) client := pb.NewRuntimeServiceClient(conn)
@ -461,7 +461,7 @@ var createContainerCommand = cli.Command{
// Test RuntimeServiceClient.CreateContainer // Test RuntimeServiceClient.CreateContainer
err = CreateContainer(client, context.String("pod"), context.String("config")) err = CreateContainer(client, context.String("pod"), context.String("config"))
if err != nil { if err != nil {
return fmt.Errorf("Creating the pod sandbox failed: %v", err) return fmt.Errorf("Creating container failed: %v", err)
} }
return nil return nil
}, },
@ -481,7 +481,7 @@ var startContainerCommand = cli.Command{
// Set up a connection to the server. // Set up a connection to the server.
conn, err := getClientConnection() conn, err := getClientConnection()
if err != nil { if err != nil {
return fmt.Errorf("Failed to connect: %v", err) return fmt.Errorf("failed to connect: %v", err)
} }
defer conn.Close() defer conn.Close()
client := pb.NewRuntimeServiceClient(conn) client := pb.NewRuntimeServiceClient(conn)
@ -508,7 +508,7 @@ var stopContainerCommand = cli.Command{
// Set up a connection to the server. // Set up a connection to the server.
conn, err := getClientConnection() conn, err := getClientConnection()
if err != nil { if err != nil {
return fmt.Errorf("Failed to connect: %v", err) return fmt.Errorf("failed to connect: %v", err)
} }
defer conn.Close() defer conn.Close()
client := pb.NewRuntimeServiceClient(conn) client := pb.NewRuntimeServiceClient(conn)
@ -535,7 +535,7 @@ var removeContainerCommand = cli.Command{
// Set up a connection to the server. // Set up a connection to the server.
conn, err := getClientConnection() conn, err := getClientConnection()
if err != nil { if err != nil {
return fmt.Errorf("Failed to connect: %v", err) return fmt.Errorf("failed to connect: %v", err)
} }
defer conn.Close() defer conn.Close()
client := pb.NewRuntimeServiceClient(conn) client := pb.NewRuntimeServiceClient(conn)
@ -562,7 +562,7 @@ var containerStatusCommand = cli.Command{
// Set up a connection to the server. // Set up a connection to the server.
conn, err := getClientConnection() conn, err := getClientConnection()
if err != nil { if err != nil {
return fmt.Errorf("Failed to connect: %v", err) return fmt.Errorf("failed to connect: %v", err)
} }
defer conn.Close() defer conn.Close()
client := pb.NewRuntimeServiceClient(conn) client := pb.NewRuntimeServiceClient(conn)

2
server/utils.go
View file

@ -16,7 +16,7 @@ import (
func getGPRCVersion() (string, error) { func getGPRCVersion() (string, error) {
_, file, _, ok := runtime.Caller(0) _, file, _, ok := runtime.Caller(0)
if !ok { if !ok {
return "", errors.New("Failed to recover the caller information.") return "", errors.New("failed to recover the caller information.")
} }
ocidRoot := filepath.Dir(filepath.Dir(file)) ocidRoot := filepath.Dir(filepath.Dir(file))