YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix serve frontend flag

Browse Source
This commit is contained in:
Steven
2024-02-20 23:24:13 +08:00
parent fa62e8b59a
commit 4a6da91719
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/memos/main.go
View File

@@ -13,7 +13,6 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"github.com/usememos/memos/internal/jobs" "github.com/usememos/memos/internal/jobs"
"github.com/usememos/memos/internal/log" "github.com/usememos/memos/internal/log"
"github.com/usememos/memos/server" "github.com/usememos/memos/server"
_profile "github.com/usememos/memos/server/profile" _profile "github.com/usememos/memos/server/profile"
@@ -174,16 +173,17 @@ func initConfig() {
fmt.Printf(`--- fmt.Printf(`---
Server profile Server profile
version: %s
data: %s data: %s
dsn: %s dsn: %s
addr: %s addr: %s
port: %d port: %d
mode: %s mode: %s
driver: %s driver: %s
version: %s frontend: %t
metric: %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() { func printGreetings() {

4
server/profile/profile.go
View File

@@ -30,8 +30,8 @@ type Profile struct {
Driver string `json:"-"` Driver string `json:"-"`
// Version is the current version of server // Version is the current version of server
Version string `json:"version"` Version string `json:"version"`
// ServeFrontend indicate the frontend is enabled or not // Frontend indicate the frontend is enabled or not
ServeFrontend bool `json:"frontend"` Frontend bool `json:"-"`
// Metric indicate the metric collection is enabled or not // Metric indicate the metric collection is enabled or not
Metric bool `json:"-"` Metric bool `json:"-"`
} }

15
server/server.go
View File

@@ -59,7 +59,7 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store
e.Use(CORSMiddleware()) e.Use(CORSMiddleware())
e.Use(middleware.TimeoutWithConfig(middleware.TimeoutConfig{ e.Use(middleware.TimeoutWithConfig(middleware.TimeoutConfig{
Skipper: timeoutSkipper, Skipper: grpcRequestSkipper,
Timeout: 30 * time.Second, Timeout: 30 * time.Second,
})) }))
@@ -69,8 +69,8 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store
} }
s.ID = serverID s.ID = serverID
if profile.ServeFrontend { // Only serve frontend when it's enabled.
// Register frontend service. if profile.Frontend {
frontendService := frontend.NewFrontendService(profile, store) frontendService := frontend.NewFrontendService(profile, store)
frontendService.Serve(ctx, e) frontendService.Serve(ctx, e)
} }
@@ -174,15 +174,6 @@ func grpcRequestSkipper(c echo.Context) bool {
return strings.HasPrefix(c.Request().URL.Path, "/memos.api.v2.") 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 { func CORSMiddleware() echo.MiddlewareFunc {
return func(next echo.HandlerFunc) echo.HandlerFunc { return func(next echo.HandlerFunc) echo.HandlerFunc {
return func(c echo.Context) error { return func(c echo.Context) error {