Merge 0baf6be8b5 into 204909b49a

display.go

@@ -305,11 +305,11 @@ func wakeDisplay(force bool, reason string) {
 		displayLogger.Warn().Err(err).Msg("failed to wake display")
 	}
 
-	if config.DisplayDimAfterSec != 0 && dimTicker != nil {
+	if config.DisplayDimAfterSec != 0 {
 		dimTicker.Reset(time.Duration(config.DisplayDimAfterSec) * time.Second)
 	}
 
-	if config.DisplayOffAfterSec != 0 && offTicker != nil {
+	if config.DisplayOffAfterSec != 0 {
 		offTicker.Reset(time.Duration(config.DisplayOffAfterSec) * time.Second)
 	}
 	backlightState = 0

pkg/nmlite/jetdhcpc/client.go

@@ -111,7 +111,6 @@ type Client struct {
 var (
 	defaultTimerDuration      = 1 * time.Second
 	defaultLinkUpTimeout      = 30 * time.Second
-	defaultDHCPTimeout        = 5 * time.Second // DHCP request timeout (not link up timeout)
 	maxRenewalAttemptDuration = 2 * time.Hour
 )
 
@@ -126,11 +125,11 @@ func NewClient(ctx context.Context, ifaces []string, c *Config, l *zerolog.Logge
 	}
 
 	if cfg.Timeout == 0 {
-		cfg.Timeout = defaultDHCPTimeout
+		cfg.Timeout = defaultLinkUpTimeout
 	}
 
 	if cfg.Retries == 0 {
-		cfg.Retries = 4
+		cfg.Retries = 3
 	}
 
 	return &Client{
@@ -154,15 +153,9 @@ func NewClient(ctx context.Context, ifaces []string, c *Config, l *zerolog.Logge
 	}, nil
 }
 
-func resetTimer(t *time.Timer, attempt int, l *zerolog.Logger) {
+func resetTimer(t *time.Timer, l *zerolog.Logger) {
-	// Exponential backoff: 1s, 2s, 4s, 8s, max 8s
+	l.Debug().Dur("delay", defaultTimerDuration).Msg("will retry later")
-	backoffAttempt := attempt
+	t.Reset(defaultTimerDuration)
-	if backoffAttempt > 3 {
-		backoffAttempt = 3
-	}
-	delay := time.Duration(1<<backoffAttempt) * time.Second
-	l.Debug().Dur("delay", delay).Int("attempt", attempt).Msg("will retry later")
-	t.Reset(delay)
 }
 
 func getRenewalTime(lease *Lease) time.Duration {
@@ -175,14 +168,12 @@ func getRenewalTime(lease *Lease) time.Duration {
 
 func (c *Client) requestLoop(t *time.Timer, family int, ifname string) {
 	l := c.l.With().Str("interface", ifname).Int("family", family).Logger()
-	attempt := 0
 	for range t.C {
-		l.Info().Int("attempt", attempt).Msg("requesting lease")
+		l.Info().Msg("requesting lease")
 
 		if _, err := c.ensureInterfaceUp(ifname); err != nil {
-			l.Error().Err(err).Int("attempt", attempt).Msg("failed to ensure interface up")
+			l.Error().Err(err).Msg("failed to ensure interface up")
-			resetTimer(t, attempt, c.l)
+			resetTimer(t, c.l)
-			attempt++
 			continue
 		}
 
@@ -197,14 +188,11 @@ func (c *Client) requestLoop(t *time.Timer, family int, ifname string) {
 			lease, err = c.requestLease6(ifname)
 		}
 		if err != nil {
-			l.Error().Err(err).Int("attempt", attempt).Msg("failed to request lease")
+			l.Error().Err(err).Msg("failed to request lease")
-			resetTimer(t, attempt, c.l)
+			resetTimer(t, c.l)
-			attempt++
 			continue
 		}
 
-		// Successfully obtained lease, reset attempt counter
-		attempt = 0
 		c.handleLeaseChange(lease)
 
 		nextRenewal := getRenewalTime(lease)

ui/src/routes/devices.$id.settings.hardware.tsx

@@ -46,10 +46,10 @@ export default function SettingsHardwareRoute() {
     }
 
     setBacklightSettings(settings);
-    handleBacklightSettingsSave(settings);
+    handleBacklightSettingsSave();
   };
 
-  const handleBacklightSettingsSave = (backlightSettings: BacklightSettings) => {
+  const handleBacklightSettingsSave = () => {
     send("setBacklightSettings", { params: backlightSettings }, (resp: JsonRpcResponse) => {
       if ("error" in resp) {
         notifications.error(
@@ -81,7 +81,7 @@ export default function SettingsHardwareRoute() {
     const duration = enabled ? 90 : -1;
     send("setVideoSleepMode", { duration }, (resp: JsonRpcResponse) => {
       if ("error" in resp) {
-        notifications.error(m.hardware_power_saving_failed_error({ error: resp.error.data || m.unknown_error() }));
+        notifications.error(m.hardware_power_saving_failed_error({ error: resp.error.data ||m.unknown_error() }));
         setPowerSavingEnabled(!enabled); // Attempt to revert on error
         return;
       }