fix: align admin behavior and Kratos integrations
This commit is contained in:
@@ -7,14 +7,14 @@ import (
|
||||
"path/filepath"
|
||||
|
||||
"kra/internal/conf"
|
||||
"kra/internal/server"
|
||||
"kra/internal/worker"
|
||||
"kra/pkg/logging"
|
||||
|
||||
"github.com/go-kratos/kratos/contrib/otel/v3/tracing"
|
||||
"github.com/go-kratos/kratos/v3"
|
||||
"github.com/go-kratos/kratos/v3/config"
|
||||
"github.com/go-kratos/kratos/v3/config/file"
|
||||
"github.com/go-kratos/kratos/v3/log"
|
||||
kratoshttp "github.com/go-kratos/kratos/v3/transport/http"
|
||||
|
||||
_ "go.uber.org/automaxprocs"
|
||||
)
|
||||
@@ -35,7 +35,7 @@ func init() {
|
||||
flag.StringVar(&flagconf, "conf", "../../configs", "config path, eg: -conf config.yaml")
|
||||
}
|
||||
|
||||
func newApp(logger *slog.Logger, hs *server.GinServer, scheduler *worker.TaskScheduler) *kratos.App {
|
||||
func newApp(logger *slog.Logger, hs *kratoshttp.Server, scheduler *worker.TaskScheduler) *kratos.App {
|
||||
return kratos.New(
|
||||
kratos.ID(id),
|
||||
kratos.Name(Name),
|
||||
@@ -51,17 +51,12 @@ func newApp(logger *slog.Logger, hs *server.GinServer, scheduler *worker.TaskSch
|
||||
|
||||
func main() {
|
||||
flag.Parse()
|
||||
logger := log.NewLogger(
|
||||
slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
|
||||
AddSource: true,
|
||||
Level: slog.LevelInfo,
|
||||
}),
|
||||
log.WithExtractor(tracing.TraceAttrs),
|
||||
).With(
|
||||
logger, closeLogger := logging.NewZapLogger("logs", "application.log",
|
||||
slog.String("service.id", id),
|
||||
slog.String("service.name", Name),
|
||||
slog.String("service.version", Version),
|
||||
)
|
||||
defer closeLogger()
|
||||
log.SetDefault(logger)
|
||||
c := config.New(
|
||||
config.WithSource(
|
||||
|
||||
Reference in New Issue
Block a user