Merge pull request #2878 from lifenjoiner/SIGHUP

Empty signal handler for Windows

Author: jedisct1

dnscrypt-proxy/hot_reload.go

@@ -1,15 +1,17 @@
 package main
 
 import (
-	"os"
-	"os/signal"
-	"syscall"
-
 	"github.com/jedisct1/dlog"
 )
 
 // InitHotReload sets up hot-reloading for configuration files
 func (proxy *Proxy) InitHotReload() error {
+	// Check if hot reload is enabled and platform has SIGHUP
+	if !proxy.enableHotReload && !HasSIGHUP {
+		dlog.Notice("Hot reload is disabled")
+		return nil
+	}
+
 	// Find plugins that support hot-reloading
 	plugins := []Plugin{}
 
@@ -105,27 +107,3 @@ func (proxy *Proxy) InitHotReload() error {
 
 	return nil
 }
-
-// setupSignalHandler sets up a SIGHUP handler to manually trigger reloads
-func setupSignalHandler(proxy *Proxy, plugins []Plugin) {
-	sigChan := make(chan os.Signal, 1)
-	signal.Notify(sigChan, syscall.SIGHUP)
-
-	go func() {
-		for {
-			sig := <-sigChan
-			if sig == syscall.SIGHUP {
-				dlog.Notice("Received SIGHUP signal, reloading configurations")
-
-				// Reload each plugin that supports hot-reloading
-				for _, plugin := range plugins {
-					if err := plugin.Reload(); err != nil {
-						dlog.Errorf("Failed to reload plugin [%s]: %v", plugin.Name(), err)
-					} else {
-						dlog.Noticef("Successfully reloaded plugin [%s]", plugin.Name())
-					}
-				}
-			}
-		}
-	}()
-}

dnscrypt-proxy/signal_others.go

@@ -0,0 +1,10 @@
+//go:build windows || (js && wasm) || wasip1
+
+package main
+
+const HasSIGHUP = false
+
+// setupSignalHandler sets up a SIGHUP handler to manually trigger reloads
+func setupSignalHandler(proxy *Proxy, plugins []Plugin) {
+	return
+}

dnscrypt-proxy/signal_posix.go

@@ -0,0 +1,37 @@
+//go:build unix && !(js && wasm) && !wasip1
+
+package main
+
+import (
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/jedisct1/dlog"
+)
+
+const HasSIGHUP = true
+
+// setupSignalHandler sets up a SIGHUP handler to manually trigger reloads
+func setupSignalHandler(proxy *Proxy, plugins []Plugin) {
+	sigChan := make(chan os.Signal, 1)
+	signal.Notify(sigChan, syscall.SIGHUP)
+
+	go func() {
+		for {
+			sig := <-sigChan
+			if sig == syscall.SIGHUP {
+				dlog.Notice("Received SIGHUP signal, reloading configurations")
+
+				// Reload each plugin that supports hot-reloading
+				for _, plugin := range plugins {
+					if err := plugin.Reload(); err != nil {
+						dlog.Errorf("Failed to reload plugin [%s]: %v", plugin.Name(), err)
+					} else {
+						dlog.Noticef("Successfully reloaded plugin [%s]", plugin.Name())
+					}
+				}
+			}
+		}
+	}()
+}