Skip to content

Commit

Permalink
Merge pull request #30 from mrpalide/fix/another-improve-on-dmsghttp-…
Browse files Browse the repository at this point in the history
…handler

Update to dmsg
  • Loading branch information
mrpalide authored Sep 10, 2024
2 parents 3ef643a + c6f419a commit 6bc920a
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 7 deletions.
4 changes: 2 additions & 2 deletions cmd/service-discovery/commands/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ PG_USER="postgres" PG_DATABASE="sd" PG_PASSWORD="" service-discovery --sk $(tail
}()

if !pk.Null() {
servers := dmsghttp.GetServers(ctx, dmsgDisc, log)
servers := dmsghttp.GetServers(ctx, dmsgDisc, dmsgServerType, log)
config := &dmsg.Config{
MinSessions: 0, // listen on all available servers
UpdateInterval: dmsg.DefaultUpdateInterval,
Expand All @@ -197,7 +197,7 @@ PG_USER="postgres" PG_DATABASE="sd" PG_PASSWORD="" service-discovery --sk $(tail
}
}()

go dmsghttp.UpdateServers(ctx, dClient, dmsgDisc, dmsgDC, log)
go dmsghttp.UpdateServers(ctx, dClient, dmsgDisc, dmsgDC, dmsgServerType, log)

go func() {
if err := dmsghttp.ListenAndServe(ctx, sk, sdAPI, dClient, dmsg.DefaultDmsgHTTPPort, dmsgDC, log); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/ivanpirog/coloredcobra v1.0.1
github.com/lib/pq v1.10.9
github.com/sirupsen/logrus v1.9.3
github.com/skycoin/dmsg v1.3.25
github.com/skycoin/dmsg v1.3.26-0.20240910062314-dc25f3d9ea6c
github.com/skycoin/skycoin v0.27.1
github.com/skycoin/skywire v1.3.25-beta
github.com/skycoin/skywire-utilities v1.3.25
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/skycoin/dmsg v1.3.25 h1:Gs4aRhLq/ZCo5I0vN3nTv/N5/MC6sunWCuS50Tct6qI=
github.com/skycoin/dmsg v1.3.25/go.mod h1:3pyc9MmDJQYP0spTAWKLMctz4+ZKjMZgXtdMmXpYolw=
github.com/skycoin/dmsg v1.3.26-0.20240910062314-dc25f3d9ea6c h1:7miiImujaW74EAD/cqs6tAXzoVRK7K9yk69R8oqKC/g=
github.com/skycoin/dmsg v1.3.26-0.20240910062314-dc25f3d9ea6c/go.mod h1:3pyc9MmDJQYP0spTAWKLMctz4+ZKjMZgXtdMmXpYolw=
github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 h1:1Nc5EBY6pjfw1kwW0duwyG+7WliWz5u9kgk1h5MnLuA=
github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:UXghlricA7J3aRD/k7p/zBObQfmBawwCxIVPVjz2Q3o=
github.com/skycoin/skycoin v0.27.1 h1:HatxsRwVSPaV4qxH6290xPBmkH/HgiuAoY2qC+e8C9I=
Expand Down
24 changes: 21 additions & 3 deletions vendor/github.com/skycoin/dmsg/pkg/dmsghttp/util.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ github.com/quic-go/quic-go/quicvarint
## explicit; go 1.13
github.com/sirupsen/logrus
github.com/sirupsen/logrus/hooks/syslog
# github.com/skycoin/dmsg v1.3.25
# github.com/skycoin/dmsg v1.3.26-0.20240910062314-dc25f3d9ea6c
## explicit; go 1.21
github.com/skycoin/dmsg/internal/servermetrics
github.com/skycoin/dmsg/pkg/direct
Expand Down

0 comments on commit 6bc920a

Please sign in to comment.