Skip to content

Commit

Permalink
Configuring proxiedsites in main instead of flashlight
Browse files Browse the repository at this point in the history
  • Loading branch information
oxtoacart committed Mar 29, 2016
1 parent 72a2195 commit 9119479
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/github.com/getlantern/flashlight/flashlight.go
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/getlantern/flashlight/config"
"github.com/getlantern/flashlight/geolookup"
"github.com/getlantern/flashlight/logging"
"github.com/getlantern/flashlight/proxiedsites"
)

const (
Expand Down Expand Up @@ -146,7 +145,6 @@ func applyClientConfig(client *client.Client, cfg *config.Config, proxyAll func(
Version, RevisionDate)
// Update client configuration
client.Configure(cfg.Client, proxyAll)
proxiedsites.Configure(cfg.ProxiedSites)
}

func displayVersion() {
Expand Down
2 changes: 2 additions & 0 deletions src/github.com/getlantern/flashlight/main/main.go
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/getlantern/golog"
"github.com/getlantern/i18n"
"github.com/getlantern/profiling"
"github.com/getlantern/proxiedsites"

"github.com/getlantern/flashlight/analytics"
"github.com/getlantern/flashlight/autoupdate"
Expand Down Expand Up @@ -263,6 +264,7 @@ func afterStart(cfg *config.Config) {
}

func onConfigUpdate(cfg *config.Config) {
proxiedsites.Configure(cfg.ProxiedSites)
autoupdate.Configure(cfg)
}

Expand Down

0 comments on commit 9119479

Please sign in to comment.