mirror of
https://github.com/fosrl/gerbil.git
synced 2026-02-28 07:46:40 +00:00
Put http server into routine
This commit is contained in:
22
main.go
22
main.go
@@ -10,9 +10,11 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
"os/signal"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/fosrl/gerbil/logger"
|
"github.com/fosrl/gerbil/logger"
|
||||||
@@ -237,16 +239,30 @@ func main() {
|
|||||||
|
|
||||||
go periodicBandwidthCheck(remoteConfigURL + "/gerbil/receive-bandwidth")
|
go periodicBandwidthCheck(remoteConfigURL + "/gerbil/receive-bandwidth")
|
||||||
|
|
||||||
|
// Start the UDP proxy server
|
||||||
server := relay.NewUDPProxyServer(":21820", remoteConfigURL, key)
|
server := relay.NewUDPProxyServer(":21820", remoteConfigURL, key)
|
||||||
err = server.Start()
|
err = server.Start()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Fatal("Failed to start server: %v", err)
|
logger.Fatal("Failed to start UDP proxy server: %v", err)
|
||||||
}
|
}
|
||||||
defer server.Stop()
|
defer server.Stop()
|
||||||
|
|
||||||
|
// Set up HTTP server
|
||||||
http.HandleFunc("/peer", handlePeer)
|
http.HandleFunc("/peer", handlePeer)
|
||||||
logger.Info("Starting server on %s", listenAddr)
|
logger.Info("Starting HTTP server on %s", listenAddr)
|
||||||
logger.Fatal("Failed to start server: %v", http.ListenAndServe(listenAddr, nil))
|
|
||||||
|
// Run HTTP server in a goroutine
|
||||||
|
go func() {
|
||||||
|
if err := http.ListenAndServe(listenAddr, nil); err != nil {
|
||||||
|
logger.Error("HTTP server failed: %v", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Keep the main goroutine running
|
||||||
|
sigCh := make(chan os.Signal, 1)
|
||||||
|
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
|
||||||
|
<-sigCh
|
||||||
|
logger.Info("Shutting down servers...")
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadRemoteConfig(url string, key wgtypes.Key, reachableAt string) (WgConfig, error) {
|
func loadRemoteConfig(url string, key wgtypes.Key, reachableAt string) (WgConfig, error) {
|
||||||
|
|||||||
Reference in New Issue
Block a user