Merge pull request #153 in DNS/adguard-dns from fix/595 to master

* commit '2dc2a0946a28f41736228db1065654716907c5b8':
  Fix #595 - Start using GO 1.12
This commit is contained in:
Alexey Dmitrievskiy 2019-02-28 18:05:27 +03:00
commit 7ec4aa91ea
4 changed files with 17 additions and 4 deletions

View file

@ -2,7 +2,7 @@ language: go
sudo: false sudo: false
go: go:
- 1.11.x - 1.12.x
- 1.x - 1.x
os: os:
- linux - linux
@ -38,7 +38,7 @@ matrix:
# Release build configuration # Release build configuration
- name: release - name: release
go: go:
- 1.11.x - 1.12.x
os: os:
- linux - linux
@ -66,7 +66,7 @@ matrix:
- name: docker - name: docker
if: type != pull_request AND (branch = master OR tag IS present) if: type != pull_request AND (branch = master OR tag IS present)
go: go:
- 1.11.x - 1.12.x
os: os:
- linux - linux
services: services:

View file

@ -70,7 +70,7 @@ Alternatively, you can use our [official Docker image](https://hub.docker.com/r/
You will need: You will need:
* [go](https://golang.org/dl/) v1.11 or later. * [go](https://golang.org/dl/) v1.12 or later.
* [node.js](https://nodejs.org/en/download/) v10 or later. * [node.js](https://nodejs.org/en/download/) v10 or later.
You can either install it via the provided links or use [brew.sh](https://brew.sh/) if you're on Mac: You can either install it via the provided links or use [brew.sh](https://brew.sh/) if you're on Mac:

11
app.go
View file

@ -69,6 +69,9 @@ func run(args options) {
// configure log level and output // configure log level and output
configureLogger(args) configureLogger(args)
// enable TLS 1.3
enableTLS13()
// print the first message after logger is configured // print the first message after logger is configured
log.Printf("AdGuard Home, version %s\n", VersionString) log.Printf("AdGuard Home, version %s\n", VersionString)
log.Debug("Current working directory is %s", config.ourWorkingDir) log.Debug("Current working directory is %s", config.ourWorkingDir)
@ -293,6 +296,14 @@ func configureLogger(args options) {
} }
} }
// TODO after GO 1.13 release TLS 1.3 will be enabled by default. Remove this afterward
func enableTLS13() {
err := os.Setenv("GODEBUG", os.Getenv("GODEBUG")+",tls13=1")
if err != nil {
log.Fatalf("Failed to enable TLS 1.3: %s", err)
}
}
func cleanup() { func cleanup() {
log.Info("Stopping AdGuard Home") log.Info("Stopping AdGuard Home")

2
go.mod
View file

@ -1,5 +1,7 @@
module github.com/AdguardTeam/AdGuardHome module github.com/AdguardTeam/AdGuardHome
go 1.12
require ( require (
github.com/AdguardTeam/dnsproxy v0.11.2 github.com/AdguardTeam/dnsproxy v0.11.2
github.com/AdguardTeam/golibs v0.1.0 github.com/AdguardTeam/golibs v0.1.0