Skip to content

Commit

Permalink
Pull request: home: imp init
Browse files Browse the repository at this point in the history
Merge in DNS/adguard-home from fix-init to master

Squashed commit of the following:

commit 551c143
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Feb 15 13:45:06 2021 +0300

    home: imp init
  • Loading branch information
ainar-g committed Feb 15, 2021
1 parent 7d1ca48 commit aebcd74
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ and this project adheres to

### Fixed

- Occasional crashes during startup.
- The field `"range_start"` in the `GET /control/dhcp/status` HTTP API response
is now correctly named again ([#2678]).
- DHCPv6 server's `ra_slaac_only` and `ra_allow_slaac` settings aren't reset to
Expand Down
10 changes: 5 additions & 5 deletions internal/home/home.go
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,11 @@ func run(args options) {
log.Fatalf("Can't initialize Web module")
}

Context.ipDetector, err = newIPDetector()
if err != nil {
log.Fatal(err)
}

if !Context.firstRun {
err := initDNSServer()
if err != nil {
Expand All @@ -324,11 +329,6 @@ func run(args options) {
}
}

Context.ipDetector, err = newIPDetector()
if err != nil {
log.Fatal(err)
}

Context.web.Start()

// wait indefinitely for other go-routines to complete their job
Expand Down

0 comments on commit aebcd74

Please sign in to comment.