Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename proxy discovery to service discovery #393

Merged
merged 2 commits into from
Jun 10, 2020
Merged

Rename proxy discovery to service discovery #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82d0e07
Rename proxy discovery to service discovery
nkryuchkov Jun 6, 2020
c98efeb
Change domains
nkryuchkov Jun 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/app/appdisc/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func (f *Factory) setDefaults() {
f.UpdateInterval = skyenv.AppDiscUpdateInterval
}
if f.ProxyDisc == "" {
f.ProxyDisc = skyenv.DefaultProxyDiscAddr
f.ProxyDisc = skyenv.DefaultServiceDiscAddr
}
}

Expand Down
8 changes: 4 additions & 4 deletions pkg/skyenv/values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
const (
DefaultTpDiscAddr = "http://transport.discovery.skywire.skycoin.com"
DefaultDmsgDiscAddr = "http://dmsg.discovery.skywire.skycoin.com"
DefaultProxyDiscAddr = "http://proxy.discovery.skywire.skycoin.com"
DefaultServiceDiscAddr = "http://service.discovery.skycoin.com"
DefaultRouteFinderAddr = "http://routefinder.skywire.skycoin.com"
DefaultUptimeTrackerAddr = "http://uptime-tracker.skywire.skycoin.com"
DefaultAddressResolverAddr = "http://address.resolver.skywire.skycoin.com"
Expand All @@ -21,10 +21,10 @@ const (
const (
TestTpDiscAddr = "http://transport.discovery.skywire.cc"
TestDmsgDiscAddr = "http://dmsg.discovery.skywire.cc"
TestProxyDiscAddr = "http://proxy.discovery.skywire.cc"
TestServiceDiscAddr = "http://service.discovery.skywire.cc"
TestRouteFinderAddr = "http://routefinder.skywire.cc"
TestUptimeTrackerAddr = "http://uptime-tracker.skywire.cc"
TestAddressResolverAddr = "http://address-resolver.skywire.cc"
TestUptimeTrackerAddr = "http://uptime.tracker.skywire.cc"
TestAddressResolverAddr = "http://address.resolver.skywire.cc"
TestSetupPK = "026c5a07de617c5c488195b76e8671bf9e7ee654d0633933e202af9e111ffa358d"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/visor/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func initLauncher(v *Visor) bool {
factory.PK = v.conf.PK
factory.SK = v.conf.SK
factory.UpdateInterval = time.Duration(conf.Discovery.UpdateInterval)
factory.ProxyDisc = conf.Discovery.ProxyDisc
factory.ProxyDisc = conf.Discovery.ServiceDisc
}

// Prepare proc manager.
Expand Down
4 changes: 2 additions & 2 deletions pkg/visor/visorconfig/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func defaultConfigFromCommon(cc *Common) (*V1, error) {

conf.Launcher.Discovery = &V1AppDisc{
UpdateInterval: Duration(skyenv.AppDiscUpdateInterval),
ProxyDisc: skyenv.DefaultProxyDiscAddr,
ServiceDisc: skyenv.DefaultServiceDiscAddr,
}

conf.Launcher.Apps = []launcher.AppConfig{
Expand Down Expand Up @@ -149,7 +149,7 @@ func MakeTestConfig(log *logging.MasterLogger, confPath string, sk *cipher.SecKe
conf.Routing.RouteFinder = skyenv.TestRouteFinderAddr
conf.Routing.SetupNodes = []cipher.PubKey{skyenv.MustPK(skyenv.TestSetupPK)}
conf.UptimeTracker.Addr = skyenv.TestUptimeTrackerAddr
conf.Launcher.Discovery.ProxyDisc = skyenv.TestProxyDiscAddr
conf.Launcher.Discovery.ServiceDisc = skyenv.TestServiceDiscAddr
conf.STCPR.AddressResolver = skyenv.TestAddressResolverAddr
conf.STCPH.AddressResolver = skyenv.TestAddressResolverAddr

Expand Down
2 changes: 1 addition & 1 deletion pkg/visor/visorconfig/v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ type V1UptimeTracker struct {
// V1AppDisc configures Skywire App Discovery Clients.
type V1AppDisc struct {
UpdateInterval Duration `json:"update_interval,omitempty"`
ProxyDisc string `json:"proxy_discovery_addr"`
ServiceDisc string `json:"proxy_discovery_addr"` // TODO: change JSON name
}

// V1Launcher configures the app launcher.
Expand Down