Patch:Read config modtime

superfly · Aug 13, 2021 · e25d4da · e25d4da
1 parent 62be7b0
commit e25d4da
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/flyctl/config.go b/flyctl/config.go
@@ -15,8 +15,8 @@ const (
 	ConfigInstaller       = "installer"
 	BuildKitNodeID        = "buildkit_node_id"
 
-	ConfigWireGuardState          = "wire_guard_state"
-	ConfigWireGuardStateTimestamp = "wire_guard_state_timestamp"
+	ConfigWireGuardState = "wire_guard_state"
+	// ConfigWireGuardStateTimestamp = "wire_guard_state_timestamp"
 
 	ConfigRegistryHost = "registry_host"
 )

diff --git a/flyctl/flyctl.go b/flyctl/flyctl.go
@@ -122,7 +122,7 @@ func GetAPIToken() string {
 
 }
 
-var writeableConfigKeys = []string{ConfigAPIToken, ConfigInstaller, ConfigWireGuardState, BuildKitNodeID, ConfigWireGuardStateTimestamp}
+var writeableConfigKeys = []string{ConfigAPIToken, ConfigInstaller, ConfigWireGuardState, BuildKitNodeID}
 
 func SaveConfig() error {
 	BackgroundTaskWG.Add(1)

diff --git a/internal/wireguard/wg.go b/internal/wireguard/wg.go
@@ -7,7 +7,6 @@ import (
 	"os"
 	"regexp"
 	"strings"
-	"time"
 
 	badrand "math/rand"
 
@@ -132,7 +131,7 @@ func getWireGuardStateForOrg(orgSlug string) (*wg.WireGuardState, error) {
 
 func setWireGuardState(s WireGuardStates) error {
 	viper.Set(flyctl.ConfigWireGuardState, s)
-	viper.Set(flyctl.ConfigWireGuardStateTimestamp, time.Now())
+	// viper.Set(flyctl.ConfigWireGuardStateTimestamp, time.Now())
 	if err := flyctl.SaveConfig(); err != nil {
 		return errors.Wrap(err, "error saving config file")
 	}
@@ -180,6 +179,6 @@ func PruneInvalidPeers(apiClient *api.Client) error {
 	return setWireGuardState(state)
 }
 
-func LastWireGuardStateChange() time.Time {
-	return viper.GetTime(flyctl.ConfigWireGuardStateTimestamp)
-}
+// func LastWireGuardStateChange() time.Time {
+// 	return viper.GetTime(flyctl.ConfigWireGuardStateTimestamp)
+// }
diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go
@@ -18,6 +18,7 @@ import (
 	"github.com/getsentry/sentry-go"
 	"github.com/superfly/flyctl/api"
 	"github.com/superfly/flyctl/cmdctx"
+	"github.com/superfly/flyctl/flyctl"
 	"github.com/superfly/flyctl/internal/wireguard"
 	"github.com/superfly/flyctl/pkg/wg"
 	"github.com/superfly/flyctl/terminal"
@@ -42,14 +43,19 @@ type handlerFunc func(net.Conn, []string) error
 func (s *Server) handle(c net.Conn) {
 	defer c.Close()
 
-	latestChange := wireguard.LastWireGuardStateChange()
+	info, err := os.Stat(flyctl.ConfigFilePath())
+	if err != nil {
+		s.errLog(c, "can't stat config file: %s", err)
+		return
+	}
+
+	latestChange := info.ModTime()
 
 	if latestChange.After(s.currentChange) {
 		s.currentChange = latestChange
 		err := s.validateTunnels()
 		if err != nil {
 			s.errLog(c, "can't validate peers: %s", err)
-			return
 		}
 		log.Printf("config change at: %s", s.currentChange.String())
 	}
@@ -114,7 +120,12 @@ func NewServer(path string, ctx *cmdctx.CmdContext) (*Server, error) {
 
 	l.SetUnlinkOnClose(true)
 
-	latestChange := wireguard.LastWireGuardStateChange()
+	info, err := os.Stat(flyctl.ConfigFilePath())
+	if err != nil {
+		return nil, fmt.Errorf("can't stat config file: %s", err)
+	}
+
+	latestChange := info.ModTime()
 
 	s := &Server{
 		listener:      l,