home.go (AdGuardHome-0.104.1) | : | home.go (AdGuardHome-0.104.3) | ||
---|---|---|---|---|
skipping to change at line 23 | skipping to change at line 23 | |||
"net/url" | "net/url" | |||
"os" | "os" | |||
"os/signal" | "os/signal" | |||
"path/filepath" | "path/filepath" | |||
"runtime" | "runtime" | |||
"strconv" | "strconv" | |||
"sync" | "sync" | |||
"syscall" | "syscall" | |||
"time" | "time" | |||
"gopkg.in/natefinch/lumberjack.v2" | ||||
"github.com/AdguardTeam/AdGuardHome/internal/agherr" | "github.com/AdguardTeam/AdGuardHome/internal/agherr" | |||
"github.com/AdguardTeam/AdGuardHome/internal/update" | ||||
"github.com/AdguardTeam/AdGuardHome/internal/util" | ||||
"github.com/AdguardTeam/AdGuardHome/internal/dhcpd" | "github.com/AdguardTeam/AdGuardHome/internal/dhcpd" | |||
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" | "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" | |||
"github.com/AdguardTeam/AdGuardHome/internal/dnsforward" | "github.com/AdguardTeam/AdGuardHome/internal/dnsforward" | |||
"github.com/AdguardTeam/AdGuardHome/internal/querylog" | "github.com/AdguardTeam/AdGuardHome/internal/querylog" | |||
"github.com/AdguardTeam/AdGuardHome/internal/stats" | "github.com/AdguardTeam/AdGuardHome/internal/stats" | |||
"github.com/AdguardTeam/AdGuardHome/internal/update" | ||||
"github.com/AdguardTeam/AdGuardHome/internal/util" | ||||
"github.com/AdguardTeam/golibs/log" | "github.com/AdguardTeam/golibs/log" | |||
"gopkg.in/natefinch/lumberjack.v2" | ||||
) | ) | |||
const ( | const ( | |||
// Used in config to indicate that syslog or eventlog (win) should be use d for logger output | // Used in config to indicate that syslog or eventlog (win) should be use d for logger output | |||
configSyslog = "syslog" | configSyslog = "syslog" | |||
) | ) | |||
// Update-related variables | // Update-related variables | |||
var ( | var ( | |||
versionString = "dev" | versionString = "dev" | |||
skipping to change at line 219 | skipping to change at line 217 | |||
} | } | |||
// 'clients' module uses 'dnsfilter' module's static data (dnsfilter.Bloc kedSvcKnown()), | // 'clients' module uses 'dnsfilter' module's static data (dnsfilter.Bloc kedSvcKnown()), | |||
// so we have to initialize dnsfilter's static data first, | // so we have to initialize dnsfilter's static data first, | |||
// but also avoid relying on automatic Go init() function | // but also avoid relying on automatic Go init() function | |||
dnsfilter.InitModule() | dnsfilter.InitModule() | |||
config.DHCP.WorkDir = Context.workDir | config.DHCP.WorkDir = Context.workDir | |||
config.DHCP.HTTPRegister = httpRegister | config.DHCP.HTTPRegister = httpRegister | |||
config.DHCP.ConfigModified = onConfigModified | config.DHCP.ConfigModified = onConfigModified | |||
if runtime.GOOS != "windows" { | ||||
Context.dhcpServer = dhcpd.Create(config.DHCP) | Context.dhcpServer = dhcpd.Create(config.DHCP) | |||
if Context.dhcpServer == nil { | if Context.dhcpServer == nil { | |||
log.Fatalf("Can't initialize DHCP module") | log.Fatalf("can't initialize dhcp module") | |||
} | ||||
} | } | |||
Context.autoHosts.Init("") | Context.autoHosts.Init("") | |||
Context.updater = update.NewUpdater(update.Config{ | Context.updater = update.NewUpdater(update.Config{ | |||
Client: Context.client, | Client: Context.client, | |||
WorkDir: Context.workDir, | WorkDir: Context.workDir, | |||
VersionURL: versionCheckURL, | VersionURL: versionCheckURL, | |||
VersionString: versionString, | VersionString: versionString, | |||
OS: runtime.GOOS, | OS: runtime.GOOS, | |||
Arch: runtime.GOARCH, | Arch: runtime.GOARCH, | |||
ARMVersion: ARMVersion, | ARMVersion: ARMVersion, | |||
End of changes. 6 change blocks. | ||||
10 lines changed or deleted | 8 lines changed or added |