zhouxhere
/
syz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat 修改server参数

This commit is contained in:
zhouxhere 2024-11-21 17:57:21 +08:00
parent 32b016a3bf
commit 39a3d6066b
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/syz.go
View File

@ -2,7 +2,6 @@ package main
import ( import (
"context" "context"
"fmt"
"log/slog" "log/slog"
"net/http" "net/http"
"os" "os"
@ -40,14 +39,13 @@ var rootCmd = &cobra.Command{
return return
} }
if err := store.Migrate(ctx); err != nil { // if err := store.Migrate(ctx); err != nil {
cancel() // cancel()
slog.Error("store migrate failed", "err", err) // slog.Error("store migrate failed", "err", err)
return // return
} // }
addr := fmt.Sprintf("%s:%d", config.Addr, config.Port) s := server.NewServer(ctx, config, store)
s := server.NewServer(ctx, addr, store)
c := make(chan os.Signal, 1) c := make(chan os.Signal, 1)
@ -78,11 +76,14 @@ func init() {
rootCmd.PersistentFlags().String("mode", "dev", `mode of server, can be "prod" or "dev"`) rootCmd.PersistentFlags().String("mode", "dev", `mode of server, can be "prod" or "dev"`)
rootCmd.PersistentFlags().String("addr", "0.0.0.0", "address of server") rootCmd.PersistentFlags().String("addr", "0.0.0.0", "address of server")
rootCmd.PersistentFlags().Int("port", 8080, "port of server") rootCmd.PersistentFlags().Int("port", 8080, "port of server")
rootCmd.PersistentFlags().String("dsn", "", "database source name") rootCmd.PersistentFlags().String("dsn", "postgresql://syz:syz_passwd@localhost:5432/syz?sslmode=disable", "database source name")
if err := viper.BindPFlags(rootCmd.PersistentFlags()); err != nil { if err := viper.BindPFlags(rootCmd.PersistentFlags()); err != nil {
panic(err) panic(err)
} }
viper.SetEnvPrefix("syz")
viper.AutomaticEnv()
} }
func main() { func main() {

2
config/config.go
View File

@ -10,7 +10,7 @@ type Config struct {
} }
func (c *Config) Validate() error { func (c *Config) Validate() error {
if c.Mode != "debug" && c.Mode != "release" { if c.Mode != "dev" && c.Mode != "prod" {
return fmt.Errorf("invalid mode: %s", c.Mode) return fmt.Errorf("invalid mode: %s", c.Mode)
} }

20
server/server.go
View File

@ -2,11 +2,13 @@ package server
import ( import (
"context" "context"
"fmt"
"log/slog" "log/slog"
"net" "net"
"net/http" "net/http"
"time" "time"
"git.zhouxhere.com/zhouxhere/syz/config"
"git.zhouxhere.com/zhouxhere/syz/store" "git.zhouxhere.com/zhouxhere/syz/store"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -15,23 +17,32 @@ import (
) )
type Server struct { type Server struct {
addr string config *config.Config
Store *store.Store Store *store.Store
httpServer *http.Server httpServer *http.Server
grpcServer *grpc.Server grpcServer *grpc.Server
} }
func NewServer(ctx context.Context, addr string, store *store.Store) *Server { func NewServer(ctx context.Context, config *config.Config, store *store.Store) *Server {
s := &Server{ s := &Server{
Store: store, Store: store,
} }
s.addr = addr s.config = config
if config.Mode == "prod" {
gin.SetMode(gin.ReleaseMode)
} else {
gin.SetMode(gin.DebugMode)
}
ginServer := gin.Default() ginServer := gin.Default()
addr := fmt.Sprintf("%s:%d", config.Addr, config.Port)
s.httpServer = &http.Server{ s.httpServer = &http.Server{
Addr: addr, Addr: addr,
Handler: ginServer, Handler: ginServer,
} }
grpcServer := grpc.NewServer() grpcServer := grpc.NewServer()
s.grpcServer = grpcServer s.grpcServer = grpcServer
@ -39,7 +50,8 @@ func NewServer(ctx context.Context, addr string, store *store.Store) *Server {
} }
func (s *Server) Start(ctx context.Context) error { func (s *Server) Start(ctx context.Context) error {
listener, err := net.Listen("tcp", s.addr) addr := fmt.Sprintf("%s:%d", s.config.Addr, s.config.Port)
listener, err := net.Listen("tcp", addr)
if err != nil { if err != nil {
return errors.Wrap(err, "failed to listen") return errors.Wrap(err, "failed to listen")
} }