Skip to content

Dont block on grpc if nothing is listeing on rkt api service port #1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 15, 2016
Merged

Dont block on grpc if nothing is listeing on rkt api service port #1218

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f4e9f6
attempt to connect to rkt api service with net before grpc
sjpotter Apr 15, 2016
3aae756
handle tim's comments
sjpotter Apr 15, 2016
755073c
constant for timeout
sjpotter Apr 15, 2016
ed56506
gofmt fix
sjpotter Apr 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions container/rkt/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package rkt

import (
"fmt"
"net"
"sync"
"time"

Expand All @@ -27,6 +28,7 @@ import (

const (
defaultRktAPIServiceAddr = "localhost:15441"
timeout = 2 * time.Second
)

var (
Expand All @@ -37,10 +39,19 @@ var (

func Client() (rktapi.PublicAPIClient, error) {
once.Do(func() {
apisvcConn, err := grpc.Dial(defaultRktAPIServiceAddr, grpc.WithInsecure(), grpc.WithTimeout(5*time.Second))
conn, err := net.DialTimeout("tcp", defaultRktAPIServiceAddr, timeout)
if err != nil {
rktClient = nil
rktClientErr = fmt.Errorf("rkt: cannot connect to rkt api service: %v", err)
rktClientErr = fmt.Errorf("rkt: cannot tcp Dial rkt api service: %v", err)
return
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just do return nil, fmt.Errorf... instead

}

conn.Close()

apisvcConn, err := grpc.Dial(defaultRktAPIServiceAddr, grpc.WithInsecure(), grpc.WithTimeout(timeout))
if err != nil {
rktClient = nil
rktClientErr = fmt.Errorf("rkt: cannot grpc Dial rkt api service: %v", err)
return
}

Expand Down