stakey/vspd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

webapi: Add Listen to webapi Config.

Browse Source 
No need for this value to be passed in separately, it can be passed in
the same as every other config value.
This commit is contained in:
jholdstock 2023-09-14 18:00:04 +01:00 committed by Jamie Holdstock
parent a33bcbcbfd
commit d1766c362e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/vspd/vspd.go
View File

@ -141,6 +141,7 @@ func (v *vspd) run() int {
// Create and start webapi server. // Create and start webapi server.
apiCfg := webapi.Config{ apiCfg := webapi.Config{
Listen: v.cfg.Listen,
VSPFee: v.cfg.VSPFee, VSPFee: v.cfg.VSPFee,
Network: v.cfg.network, Network: v.cfg.network,
SupportEmail: v.cfg.SupportEmail, SupportEmail: v.cfg.SupportEmail,
@ -152,7 +153,7 @@ func (v *vspd) run() int {
MaxVoteChangeRecords: maxVoteChangeRecords, MaxVoteChangeRecords: maxVoteChangeRecords,
VspdVersion: version.String(), VspdVersion: version.String(),
} }
err = webapi.Start(ctx, requestShutdown, &shutdownWg, v.cfg.Listen, v.db, v.cfg.logger("API"), err = webapi.Start(ctx, requestShutdown, &shutdownWg, v.db, v.cfg.logger("API"),
v.dcrd, v.wallets, apiCfg) v.dcrd, v.wallets, apiCfg)
if err != nil { if err != nil {
v.log.Errorf("Failed to initialize webapi: %v", err) v.log.Errorf("Failed to initialize webapi: %v", err)

7
internal/webapi/webapi.go
View File

@ -28,6 +28,7 @@ import (
) )
type Config struct { type Config struct {
Listen string
VSPFee float64 VSPFee float64
Network *config.Network Network *config.Network
FeeAccountName string FeeAccountName string
@ -75,7 +76,7 @@ type server struct {
} }
func Start(ctx context.Context, requestShutdown func(), shutdownWg *sync.WaitGroup, func Start(ctx context.Context, requestShutdown func(), shutdownWg *sync.WaitGroup,
listen string, vdb *database.VspDatabase, log slog.Logger, dcrd rpc.DcrdConnect, vdb *database.VspDatabase, log slog.Logger, dcrd rpc.DcrdConnect,
wallets rpc.WalletConnect, cfg Config) error { wallets rpc.WalletConnect, cfg Config) error {
s := &server{ s := &server{
@ -122,11 +123,11 @@ func Start(ctx context.Context, requestShutdown func(), shutdownWg *sync.WaitGro
// Create TCP listener. // Create TCP listener.
var listenConfig net.ListenConfig var listenConfig net.ListenConfig
listener, err := listenConfig.Listen(ctx, "tcp", listen) listener, err := listenConfig.Listen(ctx, "tcp", cfg.Listen)
if err != nil { if err != nil {
return err return err
} }
log.Infof("Listening on %s", listen) log.Infof("Listening on %s", cfg.Listen)
srv := http.Server{ srv := http.Server{
Handler: s.router(cookieSecret, dcrd, wallets), Handler: s.router(cookieSecret, dcrd, wallets),