cmd/tailscale: move the App.appDir field to the only method that uses it

Signed-off-by: Elias Naur <mail@eliasnaur.com>
pull/3/head
Elias Naur 4 years ago
parent 7de19cd9b8
commit 233515e86a

@ -29,7 +29,6 @@ import (
type App struct { type App struct {
jvm jni.JVM jvm jni.JVM
appCtx jni.Object appCtx jni.Object
appDir string
store *stateStore store *stateStore
// updates is notifies whenever netState or browseURL changes. // updates is notifies whenever netState or browseURL changes.
@ -112,11 +111,6 @@ func main() {
updates: make(chan struct{}, 1), updates: make(chan struct{}, 1),
vpnClosed: make(chan struct{}, 1), vpnClosed: make(chan struct{}, 1),
} }
appDir, err := app.DataDir()
if err != nil {
fatalErr(err)
}
a.appDir = appDir
a.store = newStateStore(a.jvm, a.appCtx) a.store = newStateStore(a.jvm, a.appCtx)
go func() { go func() {
if err := a.runBackend(); err != nil { if err := a.runBackend(); err != nil {
@ -132,9 +126,13 @@ func main() {
} }
func (a *App) runBackend() error { func (a *App) runBackend() error {
appDir, err := app.DataDir()
if err != nil {
fatalErr(err)
}
configs := make(chan *router.Config) configs := make(chan *router.Config)
configErrs := make(chan error) configErrs := make(chan error)
b, err := newBackend(a.appDir, a.jvm, a.store, func(s *router.Config) error { b, err := newBackend(appDir, a.jvm, a.store, func(s *router.Config) error {
if s == nil { if s == nil {
return nil return nil
} }

Loading…
Cancel
Save