aykhans/slash-e
1
0
Fork 0
mirror of https://github.com/aykhans/slash-e.git synced 2025-07-25 06:14:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: update server structure

Browse Source
This commit is contained in:
Steven
2023-10-17 21:54:22 +08:00
parent 328397612c
commit 3225e7c47b
10 changed files with 76 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/server.go
View File

@@ -18,6 +18,7 @@ import (
apiv2 "github.com/boojack/slash/api/v2"
"github.com/boojack/slash/internal/log"
storepb "github.com/boojack/slash/proto/gen/store"
"github.com/boojack/slash/server/metric"
"github.com/boojack/slash/server/profile"
"github.com/boojack/slash/server/service/license"
"github.com/boojack/slash/server/service/resource"
@@ -29,6 +30,7 @@ type Server struct {
Profile *profile.Profile
Store *store.Store
Secret string
licenseService *license.LicenseService
@@ -93,11 +95,12 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store
secret := "slash"
if profile.Mode == "prod" {
var err error
secret, err = s.getSystemSecretSessionName(ctx)
secret, err = s.getSecretSessionName(ctx)
if err != nil {
return nil, err
}
}
s.Secret = secret
rootGroup := e.Group("")
// Register API v1 routes.
@@ -133,6 +136,7 @@ func (s *Server) Start(ctx context.Context) error {
}
}()
metric.Enqueue("server start")
return s.e.Start(fmt.Sprintf(":%d", s.Profile.Port))
}
@@ -161,7 +165,7 @@ func grpcRequestSkipper(c echo.Context) bool {
return strings.HasPrefix(c.Request().URL.Path, "/slash.api.v2.")
}
func (s *Server) getSystemSecretSessionName(ctx context.Context) (string, error) {
func (s *Server) getSecretSessionName(ctx context.Context) (string, error) {
secretSessionSetting, err := s.Store.GetWorkspaceSetting(ctx, &store.FindWorkspaceSetting{
Key: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_SECRET_SESSION,
})