优化

cmd/kratos-admin/main.go

@@ -1,12 +1,17 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"log/slog"
+	"net"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"kra/internal/conf"
+	"kra/internal/service"
+	"kra/internal/service/dto"
 	"kra/internal/worker"
 	"kra/pkg/logging"
 
@@ -35,7 +40,12 @@ func init() {
 	flag.StringVar(&flagconf, "conf", "../../configs", "config path, eg: -conf config.yaml")
 }
 
-func newApp(logger *slog.Logger, hs *kratoshttp.Server, scheduler *worker.TaskScheduler) *kratos.App {
+func newApp(logger *slog.Logger, hs *kratoshttp.Server, scheduler *worker.TaskScheduler, audit *service.AuditRecorder, loggerControl *logging.ReloadableLogger) *kratos.App {
+	if audit != nil && loggerControl != nil {
+		loggerControl.SetErrorSink(logging.ErrorSinkFunc(func(ctx context.Context, entry logging.ErrorEntry) error {
+			return audit.CreateErrorRequest(ctx, &dto.ErrorRecordRequest{Form: entry.Form, Info: entry.Info, Level: entry.Level, RequestID: entry.RequestID, TraceID: entry.TraceID})
+		}))
+	}
 	return kratos.New(
 		kratos.ID(id),
 		kratos.Name(Name),
@@ -63,6 +73,30 @@ func zapSettings(admin *conf.AdminBackend) (string, logging.Options) {
 	return root, options
 }
 
+func httpAddress(server *conf.Server) string {
+	if server != nil && server.Http != nil && server.Http.Addr != "" {
+		return server.Http.Addr
+	}
+	return ":8000"
+}
+
+func swaggerAddress(server *conf.Server, admin *conf.AdminBackend) string {
+	address := httpAddress(server)
+	if strings.HasPrefix(address, ":") {
+		address = "127.0.0.1" + address
+	} else if host, port, err := net.SplitHostPort(address); err == nil && (host == "" || host == "0.0.0.0" || host == "::") {
+		address = net.JoinHostPort("127.0.0.1", port)
+	}
+	prefix := ""
+	if admin != nil {
+		prefix = strings.Trim(admin.RouterPrefix, "/")
+	}
+	if prefix != "" {
+		prefix = "/" + prefix
+	}
+	return "http://" + address + prefix + "/swagger/index.html"
+}
+
 func main() {
 	flag.Parse()
 	c := config.New(
@@ -87,6 +121,7 @@ func main() {
 	}
 	logger, loggerControl := logging.NewReloadableZapLogger(logRoot, "application.log", logOptions, loggerAttrs...)
 	defer loggerControl.Close()
+	slog.SetDefault(logger)
 	log.SetDefault(logger)
 	if bc.Admin != nil {
 		bc.Admin.ConfigPath = flagconf
@@ -102,11 +137,12 @@ func main() {
 	})
 	defer unsubscribeLogger()
 
-	app, cleanup, err := wireApp(bc.Server, runtime, logger, Version)
+	app, cleanup, err := wireApp(bc.Server, runtime, logger, loggerControl, Version)
 	if err != nil {
 		panic(err)
 	}
 	defer cleanup()
+	logger.Info("Kra administration service initialized", "mod", "system", "version", Version, "http_address", httpAddress(bc.Server), "swagger", swaggerAddress(bc.Server, bc.Admin), "admin_frontend", "http://127.0.0.1:8080")
 
 	// start and wait for stop signal
 	if err := app.Run(); err != nil {