mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge: * whois/rdns: process up to 100 top clients on startup 

Close #1055 Close #1035

* commit '701233a4b786495be2f7f8e5e33ebf041481df01':
  - client: fix default page size for dashboard tables
  - whois/rdns: start processing top clients on startup after DNS server is started
  * whois/rdns: process up to 100 top clients on startup
This commit is contained in:
Simon Zolin 2019-10-10 15:25:44 +03:00
parent 51f9d7e4df 701233a4b7
commit 32e87b6efb
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/Dashboard/BlockedDomains.js
View File

@ -57,6 +57,7 @@ const BlockedDomains = ({
showPagination={false} showPagination={false}
noDataText={t('no_domains_found')} noDataText={t('no_domains_found')}
minRows={6} minRows={6}
defaultPageSize={100}
className="-striped -highlight card-table-overflow stats__table" className="-striped -highlight card-table-overflow stats__table"
/> />
</Card> </Card>

1
client/src/components/Dashboard/Clients.js
View File

@ -72,6 +72,7 @@ const Clients = ({
showPagination={false} showPagination={false}
noDataText={t('no_clients_found')} noDataText={t('no_clients_found')}
minRows={6} minRows={6}
defaultPageSize={100}
className="-striped -highlight card-table-overflow" className="-striped -highlight card-table-overflow"
/> />
</Card> </Card>

1
client/src/components/Dashboard/QueriedDomains.js
View File

@ -58,6 +58,7 @@ const QueriedDomains = ({
showPagination={false} showPagination={false}
noDataText={t('no_domains_found')} noDataText={t('no_domains_found')}
minRows={6} minRows={6}
defaultPageSize={100}
className="-striped -highlight card-table-overflow stats__table" className="-striped -highlight card-table-overflow stats__table"
/> />
</Card> </Card>

24
home/dns.go
View File

@ -75,18 +75,6 @@ func initDNSServer() {
config.dnsctx.rdns = InitRDNS(&config.clients) config.dnsctx.rdns = InitRDNS(&config.clients)
config.dnsctx.whois = initWhois(&config.clients) config.dnsctx.whois = initWhois(&config.clients)
const topClientsNumber = 30 // the number of clients to get
topClients := config.stats.GetTopClientsIP(topClientsNumber)
for _, ip := range topClients {
ipAddr := net.ParseIP(ip)
if !ipAddr.IsLoopback() {
config.dnsctx.rdns.Begin(ip)
}
if isPublicIP(ipAddr) {
config.dnsctx.whois.Begin(ip)
}
}
initFiltering() initFiltering()
} }
@ -242,6 +230,18 @@ func startDNSServer() error {
return errorx.Decorate(err, "Couldn't start forwarding DNS server") return errorx.Decorate(err, "Couldn't start forwarding DNS server")
} }
const topClientsNumber = 100 // the number of clients to get
topClients := config.stats.GetTopClientsIP(topClientsNumber)
for _, ip := range topClients {
ipAddr := net.ParseIP(ip)
if !ipAddr.IsLoopback() {
config.dnsctx.rdns.Begin(ip)
}
if isPublicIP(ipAddr) {
config.dnsctx.whois.Begin(ip)
}
}
return nil return nil
} }