mv server to internal

app/plexus-server/main.go

@@ -1,114 +1,7 @@
 package main
 
-import (
-	"context"
-	"crypto/tls"
-	"log/slog"
-	"net/http"
-	"os"
-	"os/signal"
-	"sync"
-	"syscall"
-
-	"github.com/devilcove/boltdb"
-	"github.com/nats-io/nats-server/v2/server"
-	"github.com/nats-io/nats.go"
-)
-
-var (
-	newDevice   chan string
-	brokerfail  chan int
-	webfail     chan int
-	natServer   *server.Server
-	natsOptions *server.Options
-	natsConn    *nats.Conn
-	eConn       *nats.EncodedConn
-)
+import "github.com/devilcove/plexus/internal/server"
 
 func main() {
-	tlsConfig, err := configureServer()
-	if err != nil {
-		slog.Error("unable to configure server", "error", err)
-		os.Exit(1)
-	}
-	defer boltdb.Close()
-	wg := sync.WaitGroup{}
-	quit := make(chan os.Signal, 1)
-	reset := make(chan os.Signal, 1)
-	brokerfail = make(chan int, 1)
-	webfail = make(chan int, 1)
-	newDevice = make(chan string, 1)
-	signal.Notify(quit, syscall.SIGTERM, os.Interrupt)
-	signal.Notify(reset, syscall.SIGHUP)
-	ctx, cancel := context.WithCancel(context.Background())
-	start(ctx, &wg, tlsConfig)
-	for {
-		select {
-		case <-quit:
-			slog.Info("Shutting down...")
-			cancel()
-			wg.Wait()
-			return
-		case <-reset:
-			slog.Info("reset...")
-			cancel()
-			wg.Wait()
-			ctx, cancel = context.WithCancel(context.Background())
-			start(ctx, &wg, tlsConfig)
-		case <-brokerfail:
-			slog.Error("error running broker .... shutting down")
-			cancel()
-			wg.Wait()
-			os.Exit(1)
-		case <-webfail:
-			slog.Error("error running web .... shutting down")
-			cancel()
-			wg.Wait()
-			os.Exit(2)
-		}
-	}
-}
-
-func start(ctx context.Context, wg *sync.WaitGroup, tls *tls.Config) {
-	wg.Add(2)
-	go web(ctx, wg, tls)
-	go broker(ctx, wg, tls)
-}
-
-func web(ctx context.Context, wg *sync.WaitGroup, tls *tls.Config) {
-	defer wg.Done()
-	slog.Info("Starting web server...")
-	router := setupRouter()
-	server := http.Server{
-		Addr:    ":" + config.Port,
-		Handler: router,
-	}
-	if config.Secure {
-		if tls == nil {
-			slog.Error("secure set but tls nil")
-			webfail <- 1
-		}
-		server.TLSConfig = tls
-		server.Addr = ":443"
-		go func() {
-			if err := server.ListenAndServeTLS("", ""); err != nil && err != http.ErrServerClosed {
-				slog.Error("https server", "error", err)
-				webfail <- 1
-			}
-		}()
-	} else {
-		go func() {
-			if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-				slog.Error("http server", "error", err)
-				webfail <- 1
-			}
-		}()
-	}
-	slog.Info("web server started")
-	<-ctx.Done()
-	slog.Info("shutting down web server")
-	if err := server.Shutdown(ctx); err != nil {
-		slog.Error("http server shutdown", "error", err.Error())
-	}
-	slog.Info("http server shutdown")
+	server.Run()
 }

app/plexus-server/broker.go → internal/server/broker.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"context"

app/plexus-server/config.go → internal/server/config.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"crypto/tls"

app/plexus-server/config_test.go → internal/server/config_test.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"testing"

app/plexus-server/keys.go → internal/server/keys.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"encoding/base64"

app/plexus-server/keys_test.go → internal/server/keys_test.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"bytes"

app/plexus-server/nathandlers.go → internal/server/nathandlers.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"errors"

app/plexus-server/nathandlers_test.go → internal/server/nathandlers_test.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"net"

app/plexus-server/network_test.go → internal/server/network_test.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"bytes"

app/plexus-server/networks.go → internal/server/networks.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"encoding/json"

app/plexus-server/page.go → internal/server/page.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"log/slog"

app/plexus-server/page_test.go → internal/server/page_test.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"bytes"

app/plexus-server/peers.go → internal/server/peers.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"encoding/json"

app/plexus-server/publish.go → internal/server/publish.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"errors"

app/plexus-server/router.go → internal/server/router.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"crypto/rand"

app/plexus-server/router_test.go → internal/server/router_test.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"io"

internal/server/server.go

@@ -0,0 +1,142 @@
+package server
+
+import (
+	"context"
+	"crypto/tls"
+	"log/slog"
+	"net/http"
+	"os"
+	"os/exec"
+	"os/signal"
+	"strings"
+	"sync"
+	"syscall"
+
+	"github.com/devilcove/boltdb"
+	"github.com/devilcove/plexus"
+	"github.com/gin-gonic/gin"
+	"github.com/nats-io/nats-server/v2/server"
+	"github.com/nats-io/nats.go"
+)
+
+var (
+	newDevice   chan string
+	brokerfail  chan int
+	webfail     chan int
+	natServer   *server.Server
+	natsOptions *server.Options
+	natsConn    *nats.Conn
+	eConn       *nats.EncodedConn
+)
+
+// Run - run the server
+func Run() {
+	tlsConfig, err := configureServer()
+	if err != nil {
+		slog.Error("unable to configure server", "error", err)
+		os.Exit(1)
+	}
+	defer boltdb.Close()
+	wg := sync.WaitGroup{}
+	quit := make(chan os.Signal, 1)
+	reset := make(chan os.Signal, 1)
+	brokerfail = make(chan int, 1)
+	webfail = make(chan int, 1)
+	newDevice = make(chan string, 1)
+	signal.Notify(quit, syscall.SIGTERM, os.Interrupt)
+	signal.Notify(reset, syscall.SIGHUP)
+	ctx, cancel := context.WithCancel(context.Background())
+	start(ctx, &wg, tlsConfig)
+	for {
+		select {
+		case <-quit:
+			slog.Info("Shutting down...")
+			cancel()
+			wg.Wait()
+			return
+		case <-reset:
+			slog.Info("reset...")
+			cancel()
+			wg.Wait()
+			ctx, cancel = context.WithCancel(context.Background())
+			start(ctx, &wg, tlsConfig)
+		case <-brokerfail:
+			slog.Error("error running broker .... shutting down")
+			cancel()
+			wg.Wait()
+			os.Exit(1)
+		case <-webfail:
+			slog.Error("error running web .... shutting down")
+			cancel()
+			wg.Wait()
+			os.Exit(2)
+		}
+	}
+}
+
+func start(ctx context.Context, wg *sync.WaitGroup, tls *tls.Config) {
+	wg.Add(2)
+	go web(ctx, wg, tls)
+	go broker(ctx, wg, tls)
+}
+
+func web(ctx context.Context, wg *sync.WaitGroup, tls *tls.Config) {
+	defer wg.Done()
+	slog.Info("Starting web server...")
+	router := setupRouter()
+	server := http.Server{
+		Addr:    ":" + config.Port,
+		Handler: router,
+	}
+	if config.Secure {
+		if tls == nil {
+			slog.Error("secure set but tls nil")
+			webfail <- 1
+		}
+		server.TLSConfig = tls
+		server.Addr = ":443"
+		go func() {
+			if err := server.ListenAndServeTLS("", ""); err != nil && err != http.ErrServerClosed {
+				slog.Error("https server", "error", err)
+				webfail <- 1
+			}
+		}()
+	} else {
+		go func() {
+			if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+				slog.Error("http server", "error", err)
+				webfail <- 1
+			}
+		}()
+	}
+	slog.Info("web server started")
+	<-ctx.Done()
+	slog.Info("shutting down web server")
+	if err := server.Shutdown(ctx); err != nil {
+		slog.Error("http server shutdown", "error", err.Error())
+	}
+	slog.Info("http server shutdown")
+}
+
+func getServer(c *gin.Context) {
+	server := struct {
+		LogLevel string
+		Logs     []string
+	}{
+		LogLevel: config.Verbosity,
+	}
+	cmd := exec.Command("/usr/bin/journalctl", "-eu", "plexus-server", "--no-pager", "-n", "25", "-r")
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		slog.Error("journalctl", "error", err)
+	}
+	logs := string(out)
+	server.Logs = strings.Split(logs, "\n")
+	c.HTML(http.StatusOK, "server", server)
+}
+
+func setLogLevel(c *gin.Context) {
+	config.Verbosity = c.Param("level")
+	plexus.SetLogging(config.Verbosity)
+	getServer(c)
+}

app/plexus-server/subnetrouter.go → internal/server/subnetrouter.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"fmt"

app/plexus-server/subnetrouter_test.go → internal/server/subnetrouter_test.go

@@ -1,4 +1,4 @@
-package main
+package server
 
 import (
 	"errors"