Merge pull request #38 in DNS/adguard-dns from bugfix/344 to master

* commit 'a65a40c6beb00176f46e7187ba0c4b678b17f6d8':
  Update /status to return currently set upstream DNS servers.
  web UI -- Fix engrish when checking upstream DNS servers succeeds
This commit is contained in:
Eugene Bujak 2018-09-25 20:54:35 +03:00
commit 381b96a4b1
3 changed files with 12 additions and 1 deletions

View File

@ -439,7 +439,7 @@ export const testUpstream = servers => async (dispatch) => {
}); });
if (testMessages.every(message => message === 'OK')) { if (testMessages.every(message => message === 'OK')) {
dispatch(addSuccessToast('All servers is OK')); dispatch(addSuccessToast('Specified DNS servers are working correctly'));
} }
dispatch(testUpstreamSuccess()); dispatch(testUpstreamSuccess());

View File

@ -193,6 +193,7 @@ func handleStatus(w http.ResponseWriter, r *http.Request) {
"dns_address": config.BindHost, "dns_address": config.BindHost,
"dns_port": config.CoreDNS.Port, "dns_port": config.CoreDNS.Port,
"querylog_enabled": config.CoreDNS.QueryLogEnabled, "querylog_enabled": config.CoreDNS.QueryLogEnabled,
"upstream_dns": config.CoreDNS.UpstreamDNS,
} }
json, err := json.Marshal(data) json, err := json.Marshal(data)

View File

@ -61,6 +61,16 @@ paths:
responses: responses:
200: 200:
description: OK description: OK
examples:
application/json:
dns_address: 127.0.0.1
dns_port: 53
querylog_enabled: true
running: true
upstream_dns:
- 1.1.1.1
- 1.0.0.1
version: "v0.1"
/querylog: /querylog:
get: get:
tags: tags: