Merge pull request #128 from bobbyrullo/wait_on_connectors

cmd/dex-worker: wait 'til connectors are available
This commit is contained in:
bobbyrullo 2015-09-18 17:28:26 -07:00
commit 825c3cf21b

View file

@ -7,15 +7,17 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
"time"
"github.com/coreos/pkg/flagutil"
"github.com/gorilla/handlers" "github.com/gorilla/handlers"
"github.com/coreos/dex/connector"
"github.com/coreos/dex/db" "github.com/coreos/dex/db"
pflag "github.com/coreos/dex/pkg/flag" pflag "github.com/coreos/dex/pkg/flag"
"github.com/coreos/dex/pkg/log" "github.com/coreos/dex/pkg/log"
ptime "github.com/coreos/dex/pkg/time"
"github.com/coreos/dex/server" "github.com/coreos/dex/server"
"github.com/coreos/pkg/flagutil"
) )
var version = "DEV" var version = "DEV"
@ -150,9 +152,21 @@ func main() {
log.Fatalf("Unable to build Server: %v", err) log.Fatalf("Unable to build Server: %v", err)
} }
cfgs, err := srv.ConnectorConfigRepo.All() var cfgs []connector.ConnectorConfig
var sleep time.Duration
for {
var err error
cfgs, err = srv.ConnectorConfigRepo.All()
if len(cfgs) > 0 && err == nil {
break
}
sleep = ptime.ExpBackoff(sleep, time.Minute)
if err != nil { if err != nil {
log.Fatalf("Unable to fetch connector configs from repo: %v", err) log.Errorf("Unable to load connectors, retrying in %v: %v", sleep, err)
} else {
log.Errorf("No connectors, will wait. Retrying in %v.", sleep)
}
time.Sleep(sleep)
} }
for _, cfg := range cfgs { for _, cfg := range cfgs {