diff --git a/Dockerfile-builder b/Dockerfile-builder deleted file mode 100644 index 6abc06f3..00000000 --- a/Dockerfile-builder +++ /dev/null @@ -1,9 +0,0 @@ -#first stage - builder -FROM golang:1.17 -ARG version -WORKDIR /app -COPY . . -ENV GO111MODULE=auto - -# RUN GOOS=linux CGO_ENABLED=1 go build -tags debug -ldflags="-s -X 'main.version=$version'" -o netmaker main.go -RUN GOOS=linux CGO_ENABLED=1 go build -ldflags="-s -X 'main.version=$version'" -o netmaker main.go \ No newline at end of file diff --git a/defaultvalues.sh b/defaultvalues.sh deleted file mode 100644 index ba489801..00000000 --- a/defaultvalues.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -#Source this file if using default mongo settings from readme -# if i've done my work correctly, this file will be defunct -# refer to config folder for new method -export API_PORT=8081 -export GRPC_PORT=50051 -export MONGO_USER=mongoadmin -export MONGO_PASS=mongopass -export MONGO_HOST=localhost -export MASTER_KEY=c4tsRc001 -export MONGO_PORT=27017 -export MONGO_OPTS='/?authSource=admin' -export MASTER_TOKEN="mastertoken" -export CREATE_KEY="newnode123" diff --git a/netclient/command/commands.go b/netclient/command/commands.go index 3a2fb505..0cc9c6ff 100644 --- a/netclient/command/commands.go +++ b/netclient/command/commands.go @@ -1,7 +1,6 @@ package command import ( - "log" "os" "strconv" "strings" @@ -156,7 +155,7 @@ func Push(cfg config.ClientConfig) error { for _, network := range networks { err = functions.Push(network) if err != nil { - log.Printf("error pushing network configs for "+network+" network: ", err) + ncutils.PrintLog("error pushing network configs for network: "+network+"\n"+err.Error(), 1) } else { ncutils.PrintLog("pushed network config for "+network, 1) } @@ -187,7 +186,7 @@ func Pull(cfg config.ClientConfig) error { for _, network := range networks { _, err = functions.Pull(network, true) if err != nil { - log.Printf("Error pulling network config for "+network+" network: ", err) + ncutils.PrintLog("Error pulling network config for network: "+network+"\n"+err.Error(), 1) } else { ncutils.PrintLog("pulled network config for "+network, 1) } diff --git a/netclient/ncutils/util.go b/netclient/ncutils/util.go new file mode 100644 index 00000000..bb5ea373 --- /dev/null +++ b/netclient/ncutils/util.go @@ -0,0 +1,24 @@ +package ncutils + +import ( + "fmt" + "time" +) + +// BackOff - back off any function while there is an error +func BackOff(isExponential bool, maxTime int, f interface{}) (interface{}, error) { + // maxTime seconds + startTime := time.Now() + sleepTime := time.Second + for time.Now().Before(startTime.Add(time.Second * time.Duration(maxTime))) { + if result, err := f.(func() (interface{}, error))(); err == nil { + return result, nil + } + time.Sleep(sleepTime) + if isExponential { + sleepTime = sleepTime << 1 + } + PrintLog("retrying...", 1) + } + return nil, fmt.Errorf("could not find result") +}