fix: Set timeouts for restarts, use bash explicitly

pojntfx · Oct 26, 2021 · 51d5a04 · 51d5a04
1 parent 6b303ca
commit 51d5a04
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/pkg/api/proto/v1/dhclient.pb.go b/pkg/api/proto/v1/dhclient.pb.go
diff --git a/pkg/api/proto/v1/dhcpd.pb.go b/pkg/api/proto/v1/dhcpd.pb.go
diff --git a/pkg/api/proto/v1/index.pb.go b/pkg/api/proto/v1/index.pb.go
diff --git a/pkg/services/dhclient.go b/pkg/services/dhclient.go
@@ -3,6 +3,7 @@ package services
 import (
 	"context"
 	"os"
+	"time"
 
 	api "github.com/pojntfx/go-isc-dhcp/pkg/api/proto/v1"
 	"github.com/pojntfx/go-isc-dhcp/pkg/workers"
@@ -40,7 +41,9 @@ func (m *DHClientManager) Create(_ context.Context, args *api.DHClient) (*api.DH
 		// Keep the dhcp client running
 		for {
 			if !dhcpd.IsScheduledForDeletion() {
-				log.Info("Restarting dhcp client")
+				log.Info("dhcp client crashed, restarting in 1 second")
+
+				time.Sleep(time.Second)
 
 				if err := dhcpd.Start(); err != nil {
 					log.Error(err.Error())

diff --git a/pkg/services/dhcpd.go b/pkg/services/dhcpd.go
@@ -1,11 +1,12 @@
 package services
 
-//go:generate sh -c "mkdir -p ../api/proto/v1 && protoc --go_out=paths=source_relative,plugins=grpc:../api/proto/v1 -I=../../api/proto/v1 ../../api/proto/v1/*.proto"
+//go:generate bash -c "mkdir -p ../api/proto/v1 && protoc --go_out=paths=source_relative,plugins=grpc:../api/proto/v1 -I=../../api/proto/v1 ../../api/proto/v1/*.proto"
 
 import (
 	"context"
 	"os"
 	"path/filepath"
+	"time"
 
 	api "github.com/pojntfx/go-isc-dhcp/pkg/api/proto/v1"
 	"github.com/pojntfx/go-isc-dhcp/pkg/workers"
@@ -94,7 +95,9 @@ func (m *DHCPDManager) Create(_ context.Context, args *api.DHCPD) (*api.DHCPDMan
 		// Keep the dhcp server running
 		for {
 			if !dhcpd.IsScheduledForDeletion() {
-				log.Info("Restarting dhcp server")
+				log.Info("dhcp server crashed, restarting in 1 second")
+
+				time.Sleep(time.Second)
 
 				if err := dhcpd.Start(); err != nil {
 					log.Error(err.Error())

diff --git a/pkg/workers/dhcpd.go b/pkg/workers/dhcpd.go
@@ -1,11 +1,12 @@
 package workers
 
-//go:generate sh -c "rm -rf dhcp && git clone https://gitlab.isc.org/isc-projects/dhcp.git && cd dhcp && ./configure $(echo $([ -v CC ] && echo --host=${CC})) && make"
+//go:generate bash -c "rm -rf dhcp && git clone --depth 1 https://gitlab.isc.org/isc-projects/dhcp.git && cd dhcp && ./configure $(echo $([ -v CC ] && echo --host=${CC})) && make"
 
 import (
 	_ "embed"
 	"fmt"
 	"os"
+
 	"os/exec"
 	"path/filepath"
 	"strings"