diff --git a/bin/memos/main.go b/bin/memos/main.go index ed3f0793..d84e9394 100644 --- a/bin/memos/main.go +++ b/bin/memos/main.go @@ -13,7 +13,6 @@ import ( "go.uber.org/zap" "github.com/usememos/memos/internal/jobs" - "github.com/usememos/memos/internal/log" "github.com/usememos/memos/server" _profile "github.com/usememos/memos/server/profile" @@ -174,16 +173,17 @@ func initConfig() { fmt.Printf(`--- Server profile +version: %s data: %s dsn: %s addr: %s port: %d mode: %s driver: %s -version: %s +frontend: %t metric: %t --- -`, profile.Data, profile.DSN, profile.Addr, profile.Port, profile.Mode, profile.Driver, profile.Version, profile.Metric) +`, profile.Version, profile.Data, profile.DSN, profile.Addr, profile.Port, profile.Mode, profile.Driver, profile.Frontend, profile.Metric) } func printGreetings() { diff --git a/server/profile/profile.go b/server/profile/profile.go index e277f136..4547ea66 100644 --- a/server/profile/profile.go +++ b/server/profile/profile.go @@ -30,8 +30,8 @@ type Profile struct { Driver string `json:"-"` // Version is the current version of server Version string `json:"version"` - // ServeFrontend indicate the frontend is enabled or not - ServeFrontend bool `json:"frontend"` + // Frontend indicate the frontend is enabled or not + Frontend bool `json:"-"` // Metric indicate the metric collection is enabled or not Metric bool `json:"-"` } diff --git a/server/server.go b/server/server.go index 123fb1b1..3cc073f5 100644 --- a/server/server.go +++ b/server/server.go @@ -59,7 +59,7 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store e.Use(CORSMiddleware()) e.Use(middleware.TimeoutWithConfig(middleware.TimeoutConfig{ - Skipper: timeoutSkipper, + Skipper: grpcRequestSkipper, Timeout: 30 * time.Second, })) @@ -69,8 +69,8 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store } s.ID = serverID - if profile.ServeFrontend { - // Register frontend service. + // Only serve frontend when it's enabled. + if profile.Frontend { frontendService := frontend.NewFrontendService(profile, store) frontendService.Serve(ctx, e) } @@ -174,15 +174,6 @@ func grpcRequestSkipper(c echo.Context) bool { return strings.HasPrefix(c.Request().URL.Path, "/memos.api.v2.") } -func timeoutSkipper(c echo.Context) bool { - if grpcRequestSkipper(c) { - return true - } - - // Skip timeout for blob upload which is frequently timed out. - return c.Request().Method == http.MethodPost && c.Request().URL.Path == "/api/v1/resource/blob" -} - func CORSMiddleware() echo.MiddlewareFunc { return func(next echo.HandlerFunc) echo.HandlerFunc { return func(c echo.Context) error {