docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
log.Tracef("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry) | <mask> func (s *Server) ServeDHCP(p dhcp4.Packet, msgType dhcp4.MessageType, options dhcp4.Options) dhcp4.Packet {
<mask> trace("Got %v message", msgType)
<mask> trace("Leases:")
<mask> for i, lease := range s.leases {
<mask> trace("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry)
<mask> }
<mask> trace("IP pool:")
<mask> for ip, hwaddr := range s.IPpool {
<mask> trace("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr)
<mask> }
</s> Use new log wrapper and add more functions to it. </s> remove trace("Got %v message", msgType)
trace("Leases:")
</s> add log.Tracef("Got %v message", msgType)
log.Tracef("Leases:") </s> remove trace("IP pool:")
</s> add log.Tracef("IP pool:") </s> remove trace("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr)
</s> add log.Tracef("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr) </s> remove // trace("bytes.Equal(%s, %s) returned true", hwaddr, s.leases[i].hwaddr)
</s> add // log.Tracef("bytes.Equal(%s, %s) returned true", hwaddr, s.leases[i].hwaddr) </s> remove // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
</s> add // log.Tracef("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("IP pool:") | <mask> trace("Leases:")
<mask> for i, lease := range s.leases {
<mask> trace("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry)
<mask> }
<mask> trace("IP pool:")
<mask> for ip, hwaddr := range s.IPpool {
<mask> trace("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr)
<mask> }
<mask> // spew.Dump(s.leases, s.IPpool)
<mask> // log.Printf("Called with msgType = %v, options = %+v", msgType, options)
</s> Use new log wrapper and add more functions to it. </s> remove trace("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr)
</s> add log.Tracef("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr) </s> remove trace("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry)
</s> add log.Tracef("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry) </s> remove trace("Got %v message", msgType)
trace("Leases:")
</s> add log.Tracef("Got %v message", msgType)
log.Tracef("Leases:") </s> remove // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
</s> add // log.Tracef("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr) </s> remove trace("tried IP %v, got hwaddr %v", newIP, foundHWaddr)
</s> add log.Tracef("tried IP %v, got hwaddr %v", newIP, foundHWaddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr) | <mask> trace("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry)
<mask> }
<mask> trace("IP pool:")
<mask> for ip, hwaddr := range s.IPpool {
<mask> trace("IP pool entry %s -> %s", net.IPv4(ip[0], ip[1], ip[2], ip[3]), hwaddr)
<mask> }
<mask> // spew.Dump(s.leases, s.IPpool)
<mask> // log.Printf("Called with msgType = %v, options = %+v", msgType, options)
<mask> // spew.Dump(p)
<mask> // log.Printf("%14s %v", "p.Broadcast", p.Broadcast()) // false
</s> Use new log wrapper and add more functions to it. </s> remove trace("IP pool:")
</s> add log.Tracef("IP pool:") </s> remove trace("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry)
</s> add log.Tracef("Lease #%d: hwaddr %s, ip %s, expiry %s", i, lease.HWAddr, lease.IP, lease.Expiry) </s> remove trace("Got %v message", msgType)
trace("Leases:")
</s> add log.Tracef("Got %v message", msgType)
log.Tracef("Leases:") </s> remove // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
</s> add // log.Tracef("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr) </s> remove trace("tried IP %v, got hwaddr %v", newIP, foundHWaddr)
</s> add log.Tracef("tried IP %v, got hwaddr %v", newIP, foundHWaddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Got from client: Discover") | <mask>
<mask> switch msgType {
<mask> case dhcp4.Discover: // Broadcast Packet From Client - Can I have an IP?
<mask> // find a lease, but don't update lease time
<mask> trace("Got from client: Discover")
<mask> lease, err := s.reserveLease(p)
<mask> if err != nil {
<mask> trace("Couldn't find free lease: %s", err)
<mask> // couldn't find lease, don't respond
<mask> return nil
</s> Use new log wrapper and add more functions to it. </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("requested IP is %s", reqIP)
</s> add log.Tracef("requested IP is %s", reqIP) </s> remove trace("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions())
</s> add log.Tracef("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions()) </s> remove trace("Got from client: Release")
</s> add log.Tracef("Got from client: Release") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Couldn't find free lease: %s", err) | <mask> // find a lease, but don't update lease time
<mask> trace("Got from client: Discover")
<mask> lease, err := s.reserveLease(p)
<mask> if err != nil {
<mask> trace("Couldn't find free lease: %s", err)
<mask> // couldn't find lease, don't respond
<mask> return nil
<mask> }
<mask> reply := dhcp4.ReplyPacket(p, dhcp4.Offer, s.ipnet.IP, lease.IP, s.leaseTime, s.leaseOptions.SelectOrderOrAll(options[dhcp4.OptionParameterRequestList]))
<mask> trace("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions())
</s> Use new log wrapper and add more functions to it. </s> remove trace("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions())
</s> add log.Tracef("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions()) </s> remove trace("Got from client: Discover")
</s> add log.Tracef("Got from client: Discover") </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("requested IP is %s", reqIP)
</s> add log.Tracef("requested IP is %s", reqIP) </s> remove trace("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions()) | <mask> // couldn't find lease, don't respond
<mask> return nil
<mask> }
<mask> reply := dhcp4.ReplyPacket(p, dhcp4.Offer, s.ipnet.IP, lease.IP, s.leaseTime, s.leaseOptions.SelectOrderOrAll(options[dhcp4.OptionParameterRequestList]))
<mask> trace("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions())
<mask> return reply
<mask> case dhcp4.Request: // Broadcast From Client - I'll take that IP (Also start for renewals)
<mask> // start/renew a lease -- update lease time
<mask> // some clients (OSX) just go right ahead and do Request first from previously known IP, if they get NAK, they restart full cycle with Discover then Request
<mask> trace("Got from client: Request")
</s> Use new log wrapper and add more functions to it. </s> remove trace("Got from client: Request")
</s> add log.Tracef("Got from client: Request") </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("Request message not for this DHCP server (%v vs %v)", p, server, s.ipnet.IP)
</s> add log.Tracef("Request message not for this DHCP server (%v vs %v)", server, s.ipnet.IP) </s> remove trace("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr()) </s> remove trace("Got from client: Discover")
</s> add log.Tracef("Got from client: Discover") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Got from client: Request") | <mask> return reply
<mask> case dhcp4.Request: // Broadcast From Client - I'll take that IP (Also start for renewals)
<mask> // start/renew a lease -- update lease time
<mask> // some clients (OSX) just go right ahead and do Request first from previously known IP, if they get NAK, they restart full cycle with Discover then Request
<mask> trace("Got from client: Request")
<mask> if server, ok := options[dhcp4.OptionServerIdentifier]; ok && !net.IP(server).Equal(s.ipnet.IP) {
<mask> trace("Request message not for this DHCP server (%v vs %v)", p, server, s.ipnet.IP)
<mask> return nil // Message not for this dhcp server
<mask> }
<mask>
</s> Use new log wrapper and add more functions to it. </s> remove trace("Request message not for this DHCP server (%v vs %v)", p, server, s.ipnet.IP)
</s> add log.Tracef("Request message not for this DHCP server (%v vs %v)", server, s.ipnet.IP) </s> remove trace("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions())
</s> add log.Tracef("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions()) </s> remove trace("Got from client: Inform")
</s> add log.Tracef("Got from client: Inform") </s> remove trace("Got from client: Release")
</s> add log.Tracef("Got from client: Release") </s> remove trace("Got from client: Decline")
</s> add log.Tracef("Got from client: Decline") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Request message not for this DHCP server (%v vs %v)", server, s.ipnet.IP) | <mask> // start/renew a lease -- update lease time
<mask> // some clients (OSX) just go right ahead and do Request first from previously known IP, if they get NAK, they restart full cycle with Discover then Request
<mask> trace("Got from client: Request")
<mask> if server, ok := options[dhcp4.OptionServerIdentifier]; ok && !net.IP(server).Equal(s.ipnet.IP) {
<mask> trace("Request message not for this DHCP server (%v vs %v)", p, server, s.ipnet.IP)
<mask> return nil // Message not for this dhcp server
<mask> }
<mask>
<mask> reqIP := net.IP(options[dhcp4.OptionRequestedIPAddress])
<mask> if reqIP == nil {
</s> Use new log wrapper and add more functions to it. </s> remove trace("Got from client: Request")
</s> add log.Tracef("Got from client: Request") </s> remove trace("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions())
</s> add log.Tracef("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions()) </s> remove trace("Got from client: Inform")
</s> add log.Tracef("Got from client: Inform") </s> remove trace("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr()) </s> remove trace("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP)
</s> add log.Tracef("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Replying with NAK: request IP isn't valid IPv4: %s", reqIP) | <mask> reqIP = net.IP(p.CIAddr())
<mask> }
<mask>
<mask> if reqIP.To4() == nil {
<mask> trace("Replying with NAK: request IP isn't valid IPv4: %s", reqIP)
<mask> return dhcp4.ReplyPacket(p, dhcp4.NAK, s.ipnet.IP, nil, 0, nil)
<mask> }
<mask>
<mask> if reqIP.Equal(net.IPv4zero) {
<mask> trace("Replying with NAK: request IP is 0.0.0.0")
</s> Use new log wrapper and add more functions to it. </s> remove trace("Replying with NAK: request IP is 0.0.0.0")
</s> add log.Tracef("Replying with NAK: request IP is 0.0.0.0") </s> remove trace("requested IP is %s", reqIP)
</s> add log.Tracef("requested IP is %s", reqIP) </s> remove trace("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr()) </s> remove trace("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr()) </s> remove trace("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Replying with NAK: request IP is 0.0.0.0") | <mask> return dhcp4.ReplyPacket(p, dhcp4.NAK, s.ipnet.IP, nil, 0, nil)
<mask> }
<mask>
<mask> if reqIP.Equal(net.IPv4zero) {
<mask> trace("Replying with NAK: request IP is 0.0.0.0")
<mask> return dhcp4.ReplyPacket(p, dhcp4.NAK, s.ipnet.IP, nil, 0, nil)
<mask> }
<mask>
<mask> trace("requested IP is %s", reqIP)
<mask> lease, err := s.reserveLease(p)
</s> Use new log wrapper and add more functions to it. </s> remove trace("requested IP is %s", reqIP)
</s> add log.Tracef("requested IP is %s", reqIP) </s> remove trace("Replying with NAK: request IP isn't valid IPv4: %s", reqIP)
</s> add log.Tracef("Replying with NAK: request IP isn't valid IPv4: %s", reqIP) </s> remove trace("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr()) </s> remove trace("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr()) </s> remove trace("Got from client: Decline")
</s> add log.Tracef("Got from client: Decline") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("requested IP is %s", reqIP) | <mask> trace("Replying with NAK: request IP is 0.0.0.0")
<mask> return dhcp4.ReplyPacket(p, dhcp4.NAK, s.ipnet.IP, nil, 0, nil)
<mask> }
<mask>
<mask> trace("requested IP is %s", reqIP)
<mask> lease, err := s.reserveLease(p)
<mask> if err != nil {
<mask> trace("Couldn't find free lease: %s", err)
<mask> // couldn't find lease, don't respond
<mask> return nil
</s> Use new log wrapper and add more functions to it. </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("Replying with NAK: request IP is 0.0.0.0")
</s> add log.Tracef("Replying with NAK: request IP is 0.0.0.0") </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("Replying with NAK: request IP isn't valid IPv4: %s", reqIP)
</s> add log.Tracef("Replying with NAK: request IP isn't valid IPv4: %s", reqIP) </s> remove trace("Got from client: Discover")
</s> add log.Tracef("Got from client: Discover") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Couldn't find free lease: %s", err) | <mask>
<mask> trace("requested IP is %s", reqIP)
<mask> lease, err := s.reserveLease(p)
<mask> if err != nil {
<mask> trace("Couldn't find free lease: %s", err)
<mask> // couldn't find lease, don't respond
<mask> return nil
<mask> }
<mask>
<mask> if lease.IP.Equal(reqIP) {
</s> Use new log wrapper and add more functions to it. </s> remove trace("requested IP is %s", reqIP)
</s> add log.Tracef("requested IP is %s", reqIP) </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("Got from client: Discover")
</s> add log.Tracef("Got from client: Discover") </s> remove trace("Replying with NAK: request IP is 0.0.0.0")
</s> add log.Tracef("Replying with NAK: request IP is 0.0.0.0") </s> remove trace("Assigning to %s IP address %s", hwaddr, ip.String())
</s> add log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr()) | <mask>
<mask> if lease.IP.Equal(reqIP) {
<mask> // IP matches lease IP, nothing else to do
<mask> lease.Expiry = time.Now().Add(s.leaseTime)
<mask> trace("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr())
<mask> return dhcp4.ReplyPacket(p, dhcp4.ACK, s.ipnet.IP, lease.IP, s.leaseTime, s.leaseOptions.SelectOrderOrAll(options[dhcp4.OptionParameterRequestList]))
<mask> }
<mask>
<mask> //
<mask> // requested IP different from lease
</s> Use new log wrapper and add more functions to it. </s> remove trace("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr()) </s> remove trace("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions())
</s> add log.Tracef("Replying with offer: offered IP %v for %v with options %+v", lease.IP, s.leaseTime, reply.ParseOptions()) </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) </s> remove trace("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP)
</s> add log.Tracef("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP) </s> remove trace("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP) | <mask> //
<mask> // requested IP different from lease
<mask> //
<mask>
<mask> trace("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP)
<mask>
<mask> hwaddr := s.getIPpool(reqIP)
<mask> if hwaddr == nil {
<mask> // not in pool, check if it's in DHCP range
<mask> if dhcp4.IPInRange(s.leaseStart, s.leaseStop, reqIP) {
</s> Use new log wrapper and add more functions to it. </s> remove trace("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr()) </s> remove // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
</s> add // log.Tracef("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr) </s> remove trace("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr()) </s> remove trace("will try again")
</s> add log.Tracef("will try again") </s> remove trace("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr()) | <mask> if hwaddr == nil {
<mask> // not in pool, check if it's in DHCP range
<mask> if dhcp4.IPInRange(s.leaseStart, s.leaseStop, reqIP) {
<mask> // okay, we can give it to our client -- it's in our DHCP range and not taken, so let them use their IP
<mask> trace("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr())
<mask> s.unreserveIP(lease.IP)
<mask> lease.IP = reqIP
<mask> s.reserveIP(reqIP, p.CHAddr())
<mask> lease.Expiry = time.Now().Add(s.leaseTime)
<mask> return dhcp4.ReplyPacket(p, dhcp4.ACK, s.ipnet.IP, lease.IP, s.leaseTime, s.leaseOptions.SelectOrderOrAll(options[dhcp4.OptionParameterRequestList]))
</s> Use new log wrapper and add more functions to it. </s> remove trace("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr()) </s> remove trace("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP)
</s> add log.Tracef("lease IP is different from requested IP: %s vs %s", lease.IP, reqIP) </s> remove trace("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr()) </s> remove trace("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr()) </s> remove trace("Got from client: Decline")
</s> add log.Tracef("Got from client: Decline") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr()) | <mask> }
<mask>
<mask> // requsted IP is not sufficient, reply with NAK
<mask> if hwaddr != nil {
<mask> trace("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr())
<mask> return dhcp4.ReplyPacket(p, dhcp4.NAK, s.ipnet.IP, nil, 0, nil)
<mask> }
<mask>
<mask> // requested IP is outside of DHCP range
<mask> trace("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr())
</s> Use new log wrapper and add more functions to it. </s> remove trace("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr()) </s> remove trace("Got from client: Decline")
</s> add log.Tracef("Got from client: Decline") </s> remove trace("Replying with NAK: request IP is 0.0.0.0")
</s> add log.Tracef("Replying with NAK: request IP is 0.0.0.0") </s> remove trace("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr()) </s> remove trace("Replying with NAK: request IP isn't valid IPv4: %s", reqIP)
</s> add log.Tracef("Replying with NAK: request IP isn't valid IPv4: %s", reqIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr()) | <mask> return dhcp4.ReplyPacket(p, dhcp4.NAK, s.ipnet.IP, nil, 0, nil)
<mask> }
<mask>
<mask> // requested IP is outside of DHCP range
<mask> trace("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr())
<mask> return dhcp4.ReplyPacket(p, dhcp4.NAK, s.ipnet.IP, nil, 0, nil)
<mask> case dhcp4.Decline: // Broadcast From Client - Sorry I can't use that IP
<mask> trace("Got from client: Decline")
<mask>
<mask> case dhcp4.Release: // From Client, I don't need that IP anymore
</s> Use new log wrapper and add more functions to it. </s> remove trace("Got from client: Decline")
</s> add log.Tracef("Got from client: Decline") </s> remove trace("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr()) </s> remove trace("Got from client: Release")
</s> add log.Tracef("Got from client: Release") </s> remove trace("Replying with NAK: request IP is 0.0.0.0")
</s> add log.Tracef("Replying with NAK: request IP is 0.0.0.0") </s> remove trace("Got from client: Inform")
</s> add log.Tracef("Got from client: Inform") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Got from client: Decline") | <mask> // requested IP is outside of DHCP range
<mask> trace("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr())
<mask> return dhcp4.ReplyPacket(p, dhcp4.NAK, s.ipnet.IP, nil, 0, nil)
<mask> case dhcp4.Decline: // Broadcast From Client - Sorry I can't use that IP
<mask> trace("Got from client: Decline")
<mask>
<mask> case dhcp4.Release: // From Client, I don't need that IP anymore
<mask> trace("Got from client: Release")
<mask>
<mask> case dhcp4.Inform: // From Client, I have this IP and there's nothing you can do about it
</s> Use new log wrapper and add more functions to it. </s> remove trace("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr()) </s> remove trace("Got from client: Release")
</s> add log.Tracef("Got from client: Release") </s> remove trace("Got from client: Inform")
</s> add log.Tracef("Got from client: Inform") </s> remove trace("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is taken, asked by %v", reqIP, p.CHAddr()) </s> remove trace("Replying with NAK: request IP is 0.0.0.0")
</s> add log.Tracef("Replying with NAK: request IP is 0.0.0.0") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Got from client: Release") | <mask> case dhcp4.Decline: // Broadcast From Client - Sorry I can't use that IP
<mask> trace("Got from client: Decline")
<mask>
<mask> case dhcp4.Release: // From Client, I don't need that IP anymore
<mask> trace("Got from client: Release")
<mask>
<mask> case dhcp4.Inform: // From Client, I have this IP and there's nothing you can do about it
<mask> trace("Got from client: Inform")
<mask> // do nothing
<mask>
</s> Use new log wrapper and add more functions to it. </s> remove trace("Got from client: Inform")
</s> add log.Tracef("Got from client: Inform") </s> remove trace("Got from client: Decline")
</s> add log.Tracef("Got from client: Decline") </s> remove trace("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr()) </s> remove trace("Got from client: Discover")
</s> add log.Tracef("Got from client: Discover") </s> remove trace("Got from client: Request")
</s> add log.Tracef("Got from client: Request") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
log.Tracef("Got from client: Inform") | <mask> case dhcp4.Release: // From Client, I don't need that IP anymore
<mask> trace("Got from client: Release")
<mask>
<mask> case dhcp4.Inform: // From Client, I have this IP and there's nothing you can do about it
<mask> trace("Got from client: Inform")
<mask> // do nothing
<mask>
<mask> // from server -- ignore those but enumerate just in case
<mask> case dhcp4.Offer: // Broadcast From Server - Here's an IP
<mask> log.Printf("SHOULD NOT HAPPEN -- FROM ANOTHER DHCP SERVER: Offer")
</s> Use new log wrapper and add more functions to it. </s> remove trace("Got from client: Release")
</s> add log.Tracef("Got from client: Release") </s> remove trace("Got from client: Decline")
</s> add log.Tracef("Got from client: Decline") </s> remove trace("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr())
</s> add log.Tracef("Replying with NAK: request IP %s is outside of DHCP range [%s, %s], asked by %v", reqIP, s.leaseStart, s.leaseStop, p.CHAddr()) </s> remove trace("Got from client: Discover")
</s> add log.Tracef("Got from client: Discover") </s> remove trace("Got from client: Request")
</s> add log.Tracef("Got from client: Request") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/dhcpd.go |
<mask> package dhcpd
<mask>
<mask> import (
<mask> "fmt"
<mask> "log"
<mask> "net"
<mask> "os"
<mask> "path"
<mask> "runtime"
<mask> "strings"
</s> Use new log wrapper and add more functions to it. </s> remove "os"
"path"
"runtime"
</s> add </s> remove "fmt"
"os"
"path"
"runtime"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/helpers.go | |
<mask> import (
<mask> "fmt"
<mask> "log"
<mask> "net"
<mask> "os"
<mask> "path"
<mask> "runtime"
<mask> "strings"
<mask>
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "fmt"
"os"
"path"
"runtime"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/helpers.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "net"
<mask> "strings"
<mask>
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> func isTimeout(err error) bool {
<mask> operr, ok := err.(*net.OpError)
</s> Use new log wrapper and add more functions to it. </s> remove func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add </s> remove "fmt"
"os"
"path"
"runtime"
</s> add </s> remove "os"
"path"
"runtime"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/helpers.go |
<mask>
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> func trace(format string, args ...interface{}) {
<mask> pc := make([]uintptr, 10) // at least 1 entry needed
<mask> runtime.Callers(2, pc)
<mask> f := runtime.FuncForPC(pc[0])
<mask> var buf strings.Builder
<mask> buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
<mask> text := fmt.Sprintf(format, args...)
<mask> buf.WriteString(text)
<mask> if len(text) == 0 || text[len(text)-1] != '\n' {
<mask> buf.WriteRune('\n')
<mask> }
<mask> fmt.Fprint(os.Stderr, buf.String())
<mask> }
<mask>
<mask> func isTimeout(err error) bool {
<mask> operr, ok := err.(*net.OpError)
<mask> if !ok {
<mask> return false
<mask> }
</s> Use new log wrapper and add more functions to it. </s> remove
func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add </s> remove
func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/helpers.go | |
<mask> package main
<mask>
<mask> import (
<mask> "log"
<mask> "net"
<mask> "os"
<mask> "os/signal"
<mask> "syscall"
<mask> "time"
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/standalone/main.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/krolaw/dhcp4"
<mask> )
<mask>
<mask> func main() {
<mask> if len(os.Args) < 2 {
<mask> log.Printf("Usage: %s <interface name>", os.Args[0])
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove trace("tried IP %v, got hwaddr %v", newIP, foundHWaddr)
</s> add log.Tracef("tried IP %v, got hwaddr %v", newIP, foundHWaddr) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dhcpd/standalone/main.go |
<mask> package main
<mask>
<mask> import (
<mask> "fmt"
<mask> "log"
<mask> "net"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dns.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> var dnsServer = dnsforward.Server{}
<mask>
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "github.com/AdguardTeam/dnsproxy/upstream"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dns.go |
<mask> "encoding/json"
<mask> "errors"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "log"
<mask> "net"
<mask> "net/http"
<mask> "regexp"
<mask> "strings"
<mask> "sync"
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "sync/atomic"
<mask> "time"
<mask>
<mask> "github.com/bluele/gcache"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> const defaultCacheSize = 64 * 1024 // in number of elements
<mask> const defaultCacheTime = 30 * time.Minute
</s> Use new log wrapper and add more functions to it. | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter.go |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "runtime"
<mask>
<mask> "github.com/shirou/gopsutil/process"
<mask> "go.uber.org/goleak"
<mask> )
<mask>
<mask> // first in file because it must be run first
</s> Use new log wrapper and add more functions to it. </s> remove trace("RSS before loading rules - %d kB\n", start/1024)
</s> add log.Tracef("RSS before loading rules - %d kB\n", start/1024) </s> remove trace("Unpacking file %s from zipfile", f.Name)
</s> add log.Tracef("Unpacking file %s from zipfile", f.Name) </s> remove "os"
"path"
"runtime"
</s> add </s> remove "fmt"
"os"
"path"
"runtime"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("RSS before loading rules - %d kB\n", start/1024) | <mask>
<mask> // first in file because it must be run first
<mask> func TestLotsOfRulesMemoryUsage(t *testing.T) {
<mask> start := getRSS()
<mask> trace("RSS before loading rules - %d kB\n", start/1024)
<mask> dumpMemProfile(_Func() + "1.pprof")
<mask>
<mask> d := NewForTest()
<mask> defer d.Destroy()
<mask> err := loadTestRules(d)
</s> Use new log wrapper and add more functions to it. </s> remove trace("RSS before loading rules - %d kB\n", start/1024)
</s> add log.Tracef("RSS before loading rules - %d kB\n", start/1024) </s> remove trace("Have %d rules", d.Count())
</s> add log.Tracef("Have %d rules", d.Count()) </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) | <mask> t.Error(err)
<mask> }
<mask>
<mask> afterLoad := getRSS()
<mask> trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
<mask> dumpMemProfile(_Func() + "2.pprof")
<mask>
<mask> tests := []struct {
<mask> host string
<mask> match bool
</s> Use new log wrapper and add more functions to it. </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("Have %d rules", d.Count())
</s> add log.Tracef("Have %d rules", d.Count()) </s> remove trace("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024)
</s> add log.Tracef("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024) </s> remove trace("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024)
</s> add log.Tracef("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024) </s> remove trace("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024)
</s> add log.Tracef("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024) | <mask> t.Errorf("Expected hostname %s to match", testcase.host)
<mask> }
<mask> }
<mask> afterMatch := getRSS()
<mask> trace("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024)
<mask> dumpMemProfile(_Func() + "3.pprof")
<mask> }
<mask>
<mask> func getRSS() uint64 {
<mask> proc, err := process.NewProcess(int32(os.Getpid()))
</s> Use new log wrapper and add more functions to it. </s> remove trace("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024)
</s> add log.Tracef("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024) </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024)
</s> add log.Tracef("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024) </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("Have %d rules", d.Count())
</s> add log.Tracef("Have %d rules", d.Count()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("Fetching top hosts from network") | <mask>
<mask> const topHostsFilename = "../tests/top-1m.csv"
<mask>
<mask> func fetchTopHostsFromNet() {
<mask> trace("Fetching top hosts from network")
<mask> resp, err := http.Get("http://s3-us-west-1.amazonaws.com/umbrella-static/top-1m.csv.zip")
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask> defer resp.Body.Close()
</s> Use new log wrapper and add more functions to it. </s> remove trace("Reading zipfile body")
</s> add log.Tracef("Reading zipfile body") </s> remove trace("Opening zipfile")
</s> add log.Tracef("Opening zipfile") </s> remove trace("Reading file %s contents", f.Name)
</s> add log.Tracef("Reading file %s contents", f.Name) </s> remove trace("Writing file %s contents to disk", f.Name)
</s> add log.Tracef("Writing file %s contents to disk", f.Name) </s> remove trace("Unpacking file %s from zipfile", f.Name)
</s> add log.Tracef("Unpacking file %s from zipfile", f.Name) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("Reading zipfile body") | <mask> panic(err)
<mask> }
<mask> defer resp.Body.Close()
<mask>
<mask> trace("Reading zipfile body")
<mask> zipfile, err := ioutil.ReadAll(resp.Body)
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask>
</s> Use new log wrapper and add more functions to it. </s> remove trace("Reading file %s contents", f.Name)
</s> add log.Tracef("Reading file %s contents", f.Name) </s> remove trace("Fetching top hosts from network")
</s> add log.Tracef("Fetching top hosts from network") </s> remove trace("Opening zipfile")
</s> add log.Tracef("Opening zipfile") </s> remove trace("Writing file %s contents to disk", f.Name)
</s> add log.Tracef("Writing file %s contents to disk", f.Name) </s> remove trace("Unpacking file %s from zipfile", f.Name)
</s> add log.Tracef("Unpacking file %s from zipfile", f.Name) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("Opening zipfile") | <mask> if err != nil {
<mask> panic(err)
<mask> }
<mask>
<mask> trace("Opening zipfile")
<mask> r, err := zip.NewReader(bytes.NewReader(zipfile), int64(len(zipfile)))
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask>
</s> Use new log wrapper and add more functions to it. </s> remove trace("Reading file %s contents", f.Name)
</s> add log.Tracef("Reading file %s contents", f.Name) </s> remove trace("Reading zipfile body")
</s> add log.Tracef("Reading zipfile body") </s> remove trace("Writing file %s contents to disk", f.Name)
</s> add log.Tracef("Writing file %s contents to disk", f.Name) </s> remove trace("Fetching top hosts from network")
</s> add log.Tracef("Fetching top hosts from network") </s> remove trace("Unpacking file %s from zipfile", f.Name)
</s> add log.Tracef("Unpacking file %s from zipfile", f.Name) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("Unpacking file %s from zipfile", f.Name) | <mask> if len(r.File) != 1 {
<mask> panic(fmt.Errorf("zipfile must have only one entry: %+v", r))
<mask> }
<mask> f := r.File[0]
<mask> trace("Unpacking file %s from zipfile", f.Name)
<mask> rc, err := f.Open()
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask> trace("Reading file %s contents", f.Name)
</s> Use new log wrapper and add more functions to it. </s> remove trace("Reading file %s contents", f.Name)
</s> add log.Tracef("Reading file %s contents", f.Name) </s> remove trace("Writing file %s contents to disk", f.Name)
</s> add log.Tracef("Writing file %s contents to disk", f.Name) </s> remove trace("Reading zipfile body")
</s> add log.Tracef("Reading zipfile body") </s> remove trace("Opening zipfile")
</s> add log.Tracef("Opening zipfile") </s> remove trace("Fetching top hosts from network")
</s> add log.Tracef("Fetching top hosts from network") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("Reading file %s contents", f.Name) | <mask> rc, err := f.Open()
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask> trace("Reading file %s contents", f.Name)
<mask> body, err := ioutil.ReadAll(rc)
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask> rc.Close()
</s> Use new log wrapper and add more functions to it. </s> remove trace("Unpacking file %s from zipfile", f.Name)
</s> add log.Tracef("Unpacking file %s from zipfile", f.Name) </s> remove trace("Writing file %s contents to disk", f.Name)
</s> add log.Tracef("Writing file %s contents to disk", f.Name) </s> remove trace("Reading zipfile body")
</s> add log.Tracef("Reading zipfile body") </s> remove trace("Opening zipfile")
</s> add log.Tracef("Opening zipfile") </s> remove trace("Fetching top hosts from network")
</s> add log.Tracef("Fetching top hosts from network") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("Writing file %s contents to disk", f.Name) | <mask> panic(err)
<mask> }
<mask> rc.Close()
<mask>
<mask> trace("Writing file %s contents to disk", f.Name)
<mask> err = ioutil.WriteFile(topHostsFilename+".tmp", body, 0644)
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask> err = os.Rename(topHostsFilename+".tmp", topHostsFilename)
</s> Use new log wrapper and add more functions to it. </s> remove trace("Reading file %s contents", f.Name)
</s> add log.Tracef("Reading file %s contents", f.Name) </s> remove trace("Unpacking file %s from zipfile", f.Name)
</s> add log.Tracef("Unpacking file %s from zipfile", f.Name) </s> remove trace("Opening zipfile")
</s> add log.Tracef("Opening zipfile") </s> remove trace("Reading zipfile body")
</s> add log.Tracef("Reading zipfile body") </s> remove trace("Fetching top hosts from network")
</s> add log.Tracef("Fetching top hosts from network") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("RSS before loading rules - %d kB\n", start/1024) | <mask> }
<mask>
<mask> func TestLotsOfRulesLotsOfHostsMemoryUsage(t *testing.T) {
<mask> start := getRSS()
<mask> trace("RSS before loading rules - %d kB\n", start/1024)
<mask> dumpMemProfile(_Func() + "1.pprof")
<mask>
<mask> d := NewForTest()
<mask> defer d.Destroy()
<mask> mustLoadTestRules(d)
</s> Use new log wrapper and add more functions to it. </s> remove trace("RSS before loading rules - %d kB\n", start/1024)
</s> add log.Tracef("RSS before loading rules - %d kB\n", start/1024) </s> remove trace("Have %d rules", d.Count())
</s> add log.Tracef("Have %d rules", d.Count()) </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024)
</s> add log.Tracef("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("Have %d rules", d.Count()) | <mask>
<mask> d := NewForTest()
<mask> defer d.Destroy()
<mask> mustLoadTestRules(d)
<mask> trace("Have %d rules", d.Count())
<mask>
<mask> afterLoad := getRSS()
<mask> trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
<mask> dumpMemProfile(_Func() + "2.pprof")
<mask>
</s> Use new log wrapper and add more functions to it. </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024)
</s> add log.Tracef("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024) </s> remove trace("RSS before loading rules - %d kB\n", start/1024)
</s> add log.Tracef("RSS before loading rules - %d kB\n", start/1024) </s> remove trace("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024)
</s> add log.Tracef("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) | <mask> mustLoadTestRules(d)
<mask> trace("Have %d rules", d.Count())
<mask>
<mask> afterLoad := getRSS()
<mask> trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
<mask> dumpMemProfile(_Func() + "2.pprof")
<mask>
<mask> getTopHosts()
<mask> hostnames, err := os.Open(topHostsFilename)
<mask> if err != nil {
</s> Use new log wrapper and add more functions to it. </s> remove trace("Have %d rules", d.Count())
</s> add log.Tracef("Have %d rules", d.Count()) </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024)
</s> add log.Tracef("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024) </s> remove trace("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024)
</s> add log.Tracef("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024) </s> remove trace("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024)
</s> add log.Tracef("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024) | <mask> t.Fatal(err)
<mask> }
<mask> defer hostnames.Close()
<mask> afterHosts := getRSS()
<mask> trace("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024)
<mask> dumpMemProfile(_Func() + "2.pprof")
<mask>
<mask> {
<mask> scanner := bufio.NewScanner(hostnames)
<mask> for scanner.Scan() {
</s> Use new log wrapper and add more functions to it. </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("Have %d rules", d.Count())
</s> add log.Tracef("Have %d rules", d.Count()) </s> remove trace("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024)
</s> add log.Tracef("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024) </s> remove trace("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024)
</s> add log.Tracef("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
log.Tracef("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024) | <mask> }
<mask> }
<mask>
<mask> afterMatch := getRSS()
<mask> trace("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024)
<mask> dumpMemProfile(_Func() + "3.pprof")
<mask> }
<mask>
<mask> func TestRuleToRegexp(t *testing.T) {
<mask> tests := []struct {
</s> Use new log wrapper and add more functions to it. </s> remove trace("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024)
</s> add log.Tracef("RSS after matching - %d kB (%d kB diff)\n", afterMatch/1024, (afterMatch-afterLoad)/1024) </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024)
</s> add log.Tracef("RSS after loading hosts - %d kB (%d kB diff)\n", afterHosts/1024, (afterHosts-afterLoad)/1024) </s> remove trace("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024)
</s> add log.Tracef("RSS after loading rules - %d kB (%d kB diff)\n", afterLoad/1024, (afterLoad-start)/1024) </s> remove trace("Have %d rules", d.Count())
</s> add log.Tracef("Have %d rules", d.Count()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
// log.Tracef("\"%s\": %v: %s", testcase.rule, isSuffix, suffix) | <mask> if testcase.isSuffix && testcase.suffix != suffix {
<mask> t.Errorf("Result suffix does not match for \"%s\": got \"%s\" expected \"%s\"", testcase.rule, suffix, testcase.suffix)
<mask> continue
<mask> }
<mask> // trace("\"%s\": %v: %s", testcase.rule, isSuffix, suffix)
<mask> }
<mask> }
<mask>
<mask> //
<mask> // helper functions
</s> Use new log wrapper and add more functions to it. </s> remove // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
</s> add // log.Tracef("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr) </s> remove trace("tried IP %v, got hwaddr %v", newIP, foundHWaddr)
</s> add log.Tracef("tried IP %v, got hwaddr %v", newIP, foundHWaddr) </s> remove trace("will try again")
</s> add log.Tracef("will try again") </s> remove trace("Lease not found for %s: creating new one", hwaddr)
</s> add log.Tracef("Lease not found for %s: creating new one", hwaddr) </s> remove trace("Request message not for this DHCP server (%v vs %v)", p, server, s.ipnet.IP)
</s> add log.Tracef("Request message not for this DHCP server (%v vs %v)", server, s.ipnet.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/dnsfilter_test.go |
<mask> package dnsfilter
<mask>
<mask> import (
<mask> "fmt"
<mask> "os"
<mask> "path"
<mask> "runtime"
<mask> "strings"
<mask> "sync/atomic"
<mask> )
<mask>
<mask> func isValidRule(rule string) bool {
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "os"
"path"
"runtime"
</s> add </s> remove "log"
</s> add </s> remove "fmt"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/helpers.go | |
<mask> }
<mask> // swapping failed because value has changed after reading, try again
<mask> }
<mask> }
<mask>
<mask> func trace(format string, args ...interface{}) {
<mask> pc := make([]uintptr, 10) // at least 1 entry needed
<mask> runtime.Callers(2, pc)
<mask> f := runtime.FuncForPC(pc[0])
<mask> var buf strings.Builder
<mask> buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
<mask> text := fmt.Sprintf(format, args...)
<mask> buf.WriteString(text)
<mask> if len(text) == 0 || text[len(text)-1] != '\n' {
<mask> buf.WriteRune('\n')
<mask> }
<mask> fmt.Fprint(os.Stderr, buf.String())
<mask> }
</s> Use new log wrapper and add more functions to it. </s> remove
func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add </s> remove func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add </s> remove trace("will try again")
</s> add log.Tracef("will try again") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsfilter/helpers.go | |
<mask>
<mask> import (
<mask> "errors"
<mask> "fmt"
<mask> "log"
<mask> "net"
<mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "os"
"path"
"runtime"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/dnsforward.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
</s> Use new log wrapper and add more functions to it. </s> remove "github.com/AdguardTeam/dnsproxy/upstream"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/dnsforward.go |
// log.Tracef("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule) | <mask> if err != nil {
<mask> // Return immediately if there's an error
<mask> return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
<mask> } else if res.IsFiltered {
<mask> // trace("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule)
<mask> d.Res = s.genDNSFilterMessage(d, &res)
<mask> }
<mask>
<mask> return &res, err
<mask> }
</s> Use new log wrapper and add more functions to it. </s> remove trace("Assigning to %s IP address %s", hwaddr, ip.String())
</s> add log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String()) </s> remove trace("Writing file %s contents to disk", f.Name)
</s> add log.Tracef("Writing file %s contents to disk", f.Name) </s> remove trace("requested IP is %s", reqIP)
</s> add log.Tracef("requested IP is %s", reqIP) </s> remove trace("Reading file %s contents", f.Name)
</s> add log.Tracef("Reading file %s contents", f.Name) </s> remove trace("Couldn't find free lease: %s", err)
</s> add log.Tracef("Couldn't find free lease: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/dnsforward.go |
<mask>
<mask> import (
<mask> "encoding/json"
<mask> "fmt"
<mask> "log"
<mask> "net"
<mask> "net/http"
<mask> "strconv"
<mask> "strings"
<mask> "sync"
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/querylog.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> const (
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/querylog.go |
<mask> "bytes"
<mask> "compress/gzip"
<mask> "encoding/json"
<mask> "fmt"
<mask> "log"
<mask> "os"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/go-test/deep"
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/querylog_file.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "time"
<mask>
<mask> "github.com/go-test/deep"
<mask> )
<mask>
<mask> var (
<mask> fileWriteLock sync.Mutex
<mask> )
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/querylog_file.go |
// log.Tracef("skipping entry") // debug logging | <mask> continue
<mask> }
<mask>
<mask> if now.Sub(entry.Time) > timeWindow {
<mask> // trace("skipping entry") // debug logging
<mask> continue
<mask> }
<mask>
<mask> if entry.Elapsed > max {
<mask> over++
</s> Use new log wrapper and add more functions to it. </s> remove trace("will try again")
</s> add log.Tracef("will try again") </s> remove // trace("\"%s\": %v: %s", testcase.rule, isSuffix, suffix)
</s> add // log.Tracef("\"%s\": %v: %s", testcase.rule, isSuffix, suffix) </s> remove // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
</s> add // log.Tracef("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr) </s> remove trace("Opening zipfile")
</s> add log.Tracef("Opening zipfile") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/querylog_file.go |
<mask>
<mask> import (
<mask> "bytes"
<mask> "fmt"
<mask> "log"
<mask> "net/http"
<mask> "os"
<mask> "path"
<mask> "runtime"
<mask> "sort"
</s> Use new log wrapper and add more functions to it. </s> remove "os"
"path"
"runtime"
</s> add </s> remove "log"
</s> add </s> remove "fmt"
</s> add </s> remove "fmt"
"os"
"path"
"runtime"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/querylog_top.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/bluele/gcache"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> type hourTop struct {
<mask> domains gcache.Cache
</s> Use new log wrapper and add more functions to it. </s> remove "github.com/AdguardTeam/dnsproxy/upstream"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/querylog_top.go |
<mask>
<mask> import (
<mask> "encoding/json"
<mask> "fmt"
<mask> "log"
<mask> "net/http"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/stats.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> )
<mask>
<mask> var (
<mask> requests = newDNSCounter("requests_total")
</s> Use new log wrapper and add more functions to it. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/stats.go |
// log.Tracef("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed) | <mask>
<mask> func (p *periodicStats) Inc(name string, when time.Time) {
<mask> // calculate how many periods ago this happened
<mask> elapsed := int64(time.Since(when) / p.period)
<mask> // trace("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed)
<mask> if elapsed >= statsHistoryElements {
<mask> return // outside of our timeframe
<mask> }
<mask> p.Lock()
<mask> currentValues := p.Entries[name]
</s> Use new log wrapper and add more functions to it. </s> remove // trace("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed)
</s> add // log.Tracef("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed) </s> remove // trace("Will change p.Entries[%s][%d] from %v to %v", countname, elapsed, value, value+1)
</s> add // log.Tracef("Will change p.Entries[%s][%d] from %v to %v", countname, elapsed, value, value+1) </s> remove trace("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr()) </s> remove trace("Waiting %v for an answer", defaultDiscoverTime)
</s> add log.Tracef("Waiting %v for an answer", defaultDiscoverTime) </s> remove // trace("called")
</s> add // log.Tracef("called") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/stats.go |
// log.Tracef("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed) | <mask>
<mask> func (p *periodicStats) Observe(name string, when time.Time, value float64) {
<mask> // calculate how many periods ago this happened
<mask> elapsed := int64(time.Since(when) / p.period)
<mask> // trace("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed)
<mask> if elapsed >= statsHistoryElements {
<mask> return // outside of our timeframe
<mask> }
<mask> p.Lock()
<mask> {
</s> Use new log wrapper and add more functions to it. </s> remove // trace("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed)
</s> add // log.Tracef("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed) </s> remove // trace("called")
</s> add // log.Tracef("called") </s> remove // trace("Will change p.Entries[%s][%d] from %v to %v", countname, elapsed, value, value+1)
</s> add // log.Tracef("Will change p.Entries[%s][%d] from %v to %v", countname, elapsed, value, value+1) </s> remove trace("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP %v is not taken, so assigning lease IP %v to it, for %v", reqIP, lease.IP, p.CHAddr()) </s> remove trace("Waiting %v for an answer", defaultDiscoverTime)
</s> add log.Tracef("Waiting %v for an answer", defaultDiscoverTime) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/stats.go |
// log.Tracef("Will change p.Entries[%s][%d] from %v to %v", countname, elapsed, value, value+1) | <mask> {
<mask> countname := name + "_count"
<mask> currentValues := p.Entries[countname]
<mask> value := currentValues[elapsed]
<mask> // trace("Will change p.Entries[%s][%d] from %v to %v", countname, elapsed, value, value+1)
<mask> value += 1
<mask> currentValues[elapsed] = value
<mask> p.Entries[countname] = currentValues
<mask> }
<mask> {
</s> Use new log wrapper and add more functions to it. </s> remove // trace("called")
</s> add // log.Tracef("called") </s> remove // trace("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed)
</s> add // log.Tracef("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed) </s> remove
func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add </s> remove // trace("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed)
</s> add // log.Tracef("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed) </s> remove trace("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr())
</s> add log.Tracef("Replying with ACK: request IP matches lease IP, nothing else to do. IP %v for %v", lease.IP, p.CHAddr()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/stats.go |
// log.Tracef("called") | <mask> value int64
<mask> }
<mask>
<mask> func newDNSCounter(name string) *counter {
<mask> // trace("called")
<mask> return &counter{
<mask> name: name,
<mask> }
<mask> }
<mask>
</s> Use new log wrapper and add more functions to it. </s> remove // trace("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed)
</s> add // log.Tracef("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed) </s> remove "fmt"
"os"
"path"
"runtime"
</s> add </s> remove // trace("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed)
</s> add // log.Tracef("%s: %v as %v -> [%v]", name, time.Since(when), p.period, elapsed) </s> remove // trace("Will change p.Entries[%s][%d] from %v to %v", countname, elapsed, value, value+1)
</s> add // log.Tracef("Will change p.Entries[%s][%d] from %v to %v", countname, elapsed, value, value+1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | dnsforward/stats.go |
<mask>
<mask> import (
<mask> "fmt"
<mask> "io/ioutil"
<mask> "log"
<mask> "os"
<mask> "path/filepath"
<mask> "reflect"
<mask> "regexp"
<mask> "strconv"
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | filter.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> )
<mask>
<mask> var (
<mask> nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
<mask> filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
<mask> )
</s> Use new log wrapper and add more functions to it. | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | filter.go |
<mask>
<mask> import (
<mask> "bufio"
<mask> "errors"
<mask> "fmt"
<mask> "io"
<mask> "io/ioutil"
<mask> "net/http"
<mask> "os"
<mask> "path"
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | helpers.go | |
<mask> runtime.Callers(2, pc)
<mask> f := runtime.FuncForPC(pc[0])
<mask> return path.Base(f.Name())
<mask> }
<mask>
<mask> func trace(format string, args ...interface{}) {
<mask> pc := make([]uintptr, 10) // at least 1 entry needed
<mask> runtime.Callers(2, pc)
<mask> f := runtime.FuncForPC(pc[0])
<mask> var buf strings.Builder
<mask> buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
<mask> text := fmt.Sprintf(format, args...)
<mask> buf.WriteString(text)
<mask> if len(text) == 0 || text[len(text)-1] != '\n' {
<mask> buf.WriteRune('\n')
<mask> }
<mask> fmt.Fprint(os.Stderr, buf.String())
<mask> }
</s> Use new log wrapper and add more functions to it. </s> remove
func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add </s> remove func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add </s> remove trace("Unpacking file %s from zipfile", f.Name)
</s> add log.Tracef("Unpacking file %s from zipfile", f.Name) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | helpers.go | |
<mask>
<mask> import (
<mask> "fmt"
<mask> "io/ioutil"
<mask> "log"
<mask> "net/http"
<mask> "strings"
<mask> )
<mask>
<mask> // --------------------
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | i18n.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "fmt"
<mask> "io/ioutil"
<mask> "net/http"
<mask> "strings"
<mask> )
<mask>
<mask> // --------------------
<mask> // internationalization
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "fmt"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | i18n.go |
// Print calls Output to print to the standard logger.
// Arguments are handled in the manner of fmt.Print.
func Print(v ...interface{}) {
log.Print(v...)
}
| <mask>
<mask> var Verbose = false
<mask>
<mask> // Printf calls Output to print to the standard logger.
<mask> // Arguments are handled in the manner of fmt.Printf.
<mask> func Printf(format string, v ...interface{}) {
<mask> log.Printf(format, v...)
<mask> }
<mask>
</s> Use new log wrapper and add more functions to it. </s> remove func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add </s> remove trace("Assigning to %s IP address %s", hwaddr, ip.String())
</s> add log.Tracef("Assigning to %s IP address %s", hwaddr, ip.String()) </s> remove
func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add </s> remove // trace("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr)
</s> add // log.Tracef("SHOULD NOT HAPPEN: hwaddr in IP pool %s is not equal to hwaddr in lease %s", foundHWaddr, hwaddr) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | log/log.go |
// Println calls Output to print to the standard logger.
// Arguments are handled in the manner of fmt.Println.
func Println(v ...interface{}) {
log.Println(v...)
}
// Fatal is equivalent to Print() followed by a call to os.Exit(1).
func Fatal(v ...interface{}) {
log.Fatal(v...)
}
// Fatalf is equivalent to Printf() followed by a call to os.Exit(1).
func Fatalf(format string, v ...interface{}) {
log.Fatalf(format, v...)
}
| <mask> log.Printf(format, v...)
<mask> }
<mask>
<mask> func Tracef(format string, v ...interface{}) {
<mask> if Verbose {
<mask> pc := make([]uintptr, 10) // at least 1 entry needed
<mask> runtime.Callers(2, pc)
<mask> f := runtime.FuncForPC(pc[0])
<mask> var buf strings.Builder
</s> Use new log wrapper and add more functions to it. </s> remove
func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add </s> remove func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add </s> remove
func trace(format string, args ...interface{}) {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
var buf strings.Builder
buf.WriteString(fmt.Sprintf("%s(): ", path.Base(f.Name())))
text := fmt.Sprintf(format, args...)
buf.WriteString(text)
if len(text) == 0 || text[len(text)-1] != '\n' {
buf.WriteRune('\n')
}
fmt.Fprint(os.Stderr, buf.String())
}
</s> add </s> remove trace("Unpacking file %s from zipfile", f.Name)
</s> add log.Tracef("Unpacking file %s from zipfile", f.Name) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | log/log.go |
<mask>
<mask> import (
<mask> "fmt"
<mask> "io/ioutil"
<mask> "log"
<mask> "os"
<mask> "path/filepath"
<mask>
<mask> "gopkg.in/yaml.v2"
<mask> )
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add </s> remove "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | upgrade.go | |
"github.com/AdguardTeam/AdGuardHome/log" | <mask> "path/filepath"
<mask>
<mask> "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const currentSchemaVersion = 2 // used for upgrading from old configs to new config
<mask>
<mask> // Performs necessary upgrade operations if needed
</s> Use new log wrapper and add more functions to it. </s> remove "log"
</s> add </s> remove trace("Lease not found for %s: creating new one", hwaddr)
</s> add log.Tracef("Lease not found for %s: creating new one", hwaddr) </s> remove // trace("found lease for %s: %+v", hwaddr, foundLease)
</s> add // log.Tracef("found lease for %s: %+v", hwaddr, foundLease) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d8802a9709733ed1e1d34320e0c7048ac18e4ad8 | upgrade.go |
constLen = len(rules.MaskPipe) + len(rwSuccess) + len(nl) | <mask> nl = "\n"
<mask> sc = ";"
<mask>
<mask> rwSuccess = rules.MaskSeparator + "$dnsrewrite=NOERROR" + sc + "CNAME" + sc
<mask> constLen = len(rules.MaskStartURL) + len(rwSuccess) + len(nl)
<mask> )
<mask>
<mask> hp.rulesBuilder.Grow(constLen + len(host) + len(alias))
<mask> stringutil.WriteToBuilder(hp.rulesBuilder, rules.MaskStartURL, alias, rwSuccess, host, nl)
<mask> }
</s> Pull request: 3998 Make hosts rules match exactly
Merge in DNS/adguard-home from 3998-fix-hosts-gen to master
Closes #3998
Squashed commit of the following:
commit b565d51afb6c292dd16accd45b7d37ed386714e8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Dec 23 16:25:02 2021 +0300
aghnet: make hosts rules match exactly </s> remove stringutil.WriteToBuilder(hp.rulesBuilder, rules.MaskStartURL, alias, rwSuccess, host, nl)
</s> add stringutil.WriteToBuilder(hp.rulesBuilder, rules.MaskPipe, alias, rwSuccess, host, nl) </s> remove modLen = len("||") + len(rwSuccess) + len(";")
modLenPTR = len("||") + len(rwSuccessPTR)
</s> add modLen = len(rules.MaskPipe) + len(rwSuccess) + len(";")
modLenPTR = len(rules.MaskPipe) + len(rwSuccessPTR) </s> remove stringutil.WriteToBuilder(
ruleBuilder,
"||",
arpa,
rwSuccessPTR,
fqdn,
)
</s> add stringutil.WriteToBuilder(ruleBuilder, rules.MaskPipe, arpa, rwSuccessPTR, fqdn)
</s> remove "||",
</s> add rules.MaskPipe, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d9df7c13becdccc250d43423e81d777aadcae346 | internal/aghnet/hostscontainer.go |
stringutil.WriteToBuilder(hp.rulesBuilder, rules.MaskPipe, alias, rwSuccess, host, nl) | <mask> constLen = len(rules.MaskStartURL) + len(rwSuccess) + len(nl)
<mask> )
<mask>
<mask> hp.rulesBuilder.Grow(constLen + len(host) + len(alias))
<mask> stringutil.WriteToBuilder(hp.rulesBuilder, rules.MaskStartURL, alias, rwSuccess, host, nl)
<mask> }
<mask>
<mask> // writeMainHostRule writes the actual rule for the qtype and the PTR for the
<mask> // host-ip pair into internal builders.
<mask> func (hp *hostsParser) writeMainHostRule(host string, ip net.IP) (added, addedPtr string) {
</s> Pull request: 3998 Make hosts rules match exactly
Merge in DNS/adguard-home from 3998-fix-hosts-gen to master
Closes #3998
Squashed commit of the following:
commit b565d51afb6c292dd16accd45b7d37ed386714e8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Dec 23 16:25:02 2021 +0300
aghnet: make hosts rules match exactly </s> remove constLen = len(rules.MaskStartURL) + len(rwSuccess) + len(nl)
</s> add constLen = len(rules.MaskPipe) + len(rwSuccess) + len(nl) </s> remove modLen = len("||") + len(rwSuccess) + len(";")
modLenPTR = len("||") + len(rwSuccessPTR)
</s> add modLen = len(rules.MaskPipe) + len(rwSuccess) + len(";")
modLenPTR = len(rules.MaskPipe) + len(rwSuccessPTR) </s> remove stringutil.WriteToBuilder(
ruleBuilder,
"||",
arpa,
rwSuccessPTR,
fqdn,
)
</s> add stringutil.WriteToBuilder(ruleBuilder, rules.MaskPipe, arpa, rwSuccessPTR, fqdn)
</s> remove "||",
</s> add rules.MaskPipe, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d9df7c13becdccc250d43423e81d777aadcae346 | internal/aghnet/hostscontainer.go |
modLen = len(rules.MaskPipe) + len(rwSuccess) + len(";")
modLenPTR = len(rules.MaskPipe) + len(rwSuccessPTR) | <mask>
<mask> rwSuccess = "^$dnsrewrite=NOERROR;"
<mask> rwSuccessPTR = "^$dnsrewrite=NOERROR;PTR;"
<mask>
<mask> modLen = len("||") + len(rwSuccess) + len(";")
<mask> modLenPTR = len("||") + len(rwSuccessPTR)
<mask> )
<mask>
<mask> var qtype string
<mask> // The validation of the IP address has been performed earlier so it is
<mask> // guaranteed to be either an IPv4 or an IPv6.
</s> Pull request: 3998 Make hosts rules match exactly
Merge in DNS/adguard-home from 3998-fix-hosts-gen to master
Closes #3998
Squashed commit of the following:
commit b565d51afb6c292dd16accd45b7d37ed386714e8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Dec 23 16:25:02 2021 +0300
aghnet: make hosts rules match exactly </s> remove stringutil.WriteToBuilder(hp.rulesBuilder, rules.MaskStartURL, alias, rwSuccess, host, nl)
</s> add stringutil.WriteToBuilder(hp.rulesBuilder, rules.MaskPipe, alias, rwSuccess, host, nl) </s> remove constLen = len(rules.MaskStartURL) + len(rwSuccess) + len(nl)
</s> add constLen = len(rules.MaskPipe) + len(rwSuccess) + len(nl) </s> remove stringutil.WriteToBuilder(
ruleBuilder,
"||",
arpa,
rwSuccessPTR,
fqdn,
)
</s> add stringutil.WriteToBuilder(ruleBuilder, rules.MaskPipe, arpa, rwSuccessPTR, fqdn)
</s> remove "||",
</s> add rules.MaskPipe, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d9df7c13becdccc250d43423e81d777aadcae346 | internal/aghnet/hostscontainer.go |
rules.MaskPipe, | <mask> ruleBuilder := &strings.Builder{}
<mask> ruleBuilder.Grow(modLen + len(host) + len(qtype) + len(ipStr))
<mask> stringutil.WriteToBuilder(
<mask> ruleBuilder,
<mask> "||",
<mask> host,
<mask> rwSuccess,
<mask> qtype,
<mask> ";",
<mask> ipStr,
</s> Pull request: 3998 Make hosts rules match exactly
Merge in DNS/adguard-home from 3998-fix-hosts-gen to master
Closes #3998
Squashed commit of the following:
commit b565d51afb6c292dd16accd45b7d37ed386714e8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Dec 23 16:25:02 2021 +0300
aghnet: make hosts rules match exactly </s> remove stringutil.WriteToBuilder(
ruleBuilder,
"||",
arpa,
rwSuccessPTR,
fqdn,
)
</s> add stringutil.WriteToBuilder(ruleBuilder, rules.MaskPipe, arpa, rwSuccessPTR, fqdn)
</s> remove constLen = len(rules.MaskStartURL) + len(rwSuccess) + len(nl)
</s> add constLen = len(rules.MaskPipe) + len(rwSuccess) + len(nl) </s> remove stringutil.WriteToBuilder(hp.rulesBuilder, rules.MaskStartURL, alias, rwSuccess, host, nl)
</s> add stringutil.WriteToBuilder(hp.rulesBuilder, rules.MaskPipe, alias, rwSuccess, host, nl) </s> remove modLen = len("||") + len(rwSuccess) + len(";")
modLenPTR = len("||") + len(rwSuccessPTR)
</s> add modLen = len(rules.MaskPipe) + len(rwSuccess) + len(";")
modLenPTR = len(rules.MaskPipe) + len(rwSuccessPTR) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d9df7c13becdccc250d43423e81d777aadcae346 | internal/aghnet/hostscontainer.go |
stringutil.WriteToBuilder(ruleBuilder, rules.MaskPipe, arpa, rwSuccessPTR, fqdn)
| <mask> added = ruleBuilder.String()
<mask>
<mask> ruleBuilder.Reset()
<mask> ruleBuilder.Grow(modLenPTR + len(arpa) + len(fqdn))
<mask> stringutil.WriteToBuilder(
<mask> ruleBuilder,
<mask> "||",
<mask> arpa,
<mask> rwSuccessPTR,
<mask> fqdn,
<mask> )
<mask> addedPtr = ruleBuilder.String()
<mask>
<mask> hp.rulesBuilder.Grow(len(added) + len(addedPtr) + 2*len(nl))
<mask> stringutil.WriteToBuilder(hp.rulesBuilder, added, nl, addedPtr, nl)
<mask>
</s> Pull request: 3998 Make hosts rules match exactly
Merge in DNS/adguard-home from 3998-fix-hosts-gen to master
Closes #3998
Squashed commit of the following:
commit b565d51afb6c292dd16accd45b7d37ed386714e8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Dec 23 16:25:02 2021 +0300
aghnet: make hosts rules match exactly </s> remove constLen = len(rules.MaskStartURL) + len(rwSuccess) + len(nl)
</s> add constLen = len(rules.MaskPipe) + len(rwSuccess) + len(nl) </s> remove "||",
</s> add rules.MaskPipe, </s> remove stringutil.WriteToBuilder(hp.rulesBuilder, rules.MaskStartURL, alias, rwSuccess, host, nl)
</s> add stringutil.WriteToBuilder(hp.rulesBuilder, rules.MaskPipe, alias, rwSuccess, host, nl) </s> remove modLen = len("||") + len(rwSuccess) + len(";")
modLenPTR = len("||") + len(rwSuccessPTR)
</s> add modLen = len(rules.MaskPipe) + len(rwSuccess) + len(";")
modLenPTR = len(rules.MaskPipe) + len(rwSuccessPTR) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d9df7c13becdccc250d43423e81d777aadcae346 | internal/aghnet/hostscontainer.go |
<mask> github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8
<mask> github.com/kisielk/errcheck v1.6.0
<mask> github.com/kyoh86/looppointer v0.1.7
<mask> github.com/securego/gosec/v2 v2.11.0
<mask> golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
<mask> golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a
<mask> honnef.co/go/tools v0.3.1
<mask> mvdan.cc/gofumpt v0.3.1
<mask> mvdan.cc/unparam v0.0.0-20220316160445-06cc5682983b
<mask> )
</s> Pull request: upd-links-etc
Merge in DNS/adguard-home from upd-links-etc to master
Squashed commit of the following:
commit 49856df394f1a2123a27afdb35047d3b1a49860f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 20:43:10 2022 +0300
all: revert cdn link revert
commit 59bbe4bbd300f48674c1a6224a91f9a567d6c79c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 20:40:50 2022 +0300
all: revert static link revert
commit fe2acc4a0d6d5ee31cb8dbb0d0e0984c3cd723db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 18:24:02 2022 +0300
all: revert links up in README; imp tools </s> remove golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
</s> add </s> remove _ "golang.org/x/lint/golint"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da320795165fc1dd861a71c1ded84243b82a4713 | internal/tools/go.mod | |
<mask> golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
<mask> golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
<mask> golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
<mask> golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
<mask> golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
<mask> golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
<mask> golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
<mask> golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
<mask> golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
<mask> golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
</s> Pull request: upd-links-etc
Merge in DNS/adguard-home from upd-links-etc to master
Squashed commit of the following:
commit 49856df394f1a2123a27afdb35047d3b1a49860f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 20:43:10 2022 +0300
all: revert cdn link revert
commit 59bbe4bbd300f48674c1a6224a91f9a567d6c79c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 20:40:50 2022 +0300
all: revert static link revert
commit fe2acc4a0d6d5ee31cb8dbb0d0e0984c3cd723db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 18:24:02 2022 +0300
all: revert links up in README; imp tools </s> remove golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
</s> add </s> remove _ "golang.org/x/lint/golint"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da320795165fc1dd861a71c1ded84243b82a4713 | internal/tools/go.sum | |
<mask> _ "github.com/gordonklaus/ineffassign"
<mask> _ "github.com/kisielk/errcheck"
<mask> _ "github.com/kyoh86/looppointer"
<mask> _ "github.com/securego/gosec/v2/cmd/gosec"
<mask> _ "golang.org/x/lint/golint"
<mask> _ "golang.org/x/tools/go/analysis/passes/nilness/cmd/nilness"
<mask> _ "golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow"
<mask> _ "honnef.co/go/tools/cmd/staticcheck"
<mask> _ "mvdan.cc/gofumpt"
<mask> _ "mvdan.cc/unparam"
</s> Pull request: upd-links-etc
Merge in DNS/adguard-home from upd-links-etc to master
Squashed commit of the following:
commit 49856df394f1a2123a27afdb35047d3b1a49860f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 20:43:10 2022 +0300
all: revert cdn link revert
commit 59bbe4bbd300f48674c1a6224a91f9a567d6c79c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 20:40:50 2022 +0300
all: revert static link revert
commit fe2acc4a0d6d5ee31cb8dbb0d0e0984c3cd723db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 18:24:02 2022 +0300
all: revert links up in README; imp tools </s> remove golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
</s> add </s> remove golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da320795165fc1dd861a71c1ded84243b82a4713 | internal/tools/tools.go | |
PATH=$(GOPATH)/bin:$(PATH) go generate ./... | <mask> .PHONY: all build client client-watch docker lint test dependencies clean release docker-multi-arch
<mask> all: build
<mask>
<mask> build: dependencies client
<mask> go generate ./...
<mask> CGO_ENABLED=0 go build -ldflags="-s -w -X main.version=$(VERSION) -X main.channel=$(CHANNEL) -X main.goarm=$(GOARM)"
<mask> PATH=$(GOPATH)/bin:$(PATH) packr clean
<mask>
<mask> client:
<mask> npm --prefix client run build-prod
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove options.map((option) => ({ value: option, label: option }))
</s> add options.map((option) => ({
value: option,
label: option,
})) </s> remove route: MENU_URLS.logs, icon: 'log', text: 'query_log', order: 3,
</s> add route: MENU_URLS.logs,
icon: 'log',
text: 'query_log',
order: 3, </s> remove t,
</s> add </s> remove refreshButton,
subtitle,
dnsQueries,
blockedFiltering,
replacedSafebrowsing,
replacedParental,
replacedSafesearch,
</s> add numDnsQueries,
numBlockedFiltering,
numReplacedSafebrowsing,
numReplacedParental,
numReplacedSafesearch, </s> remove } = props;
</s> add } = useSelector((state) => state.stats, shallowEqual);
const { t } = useTranslation(); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | Makefile |
"kind-of": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
}, | <mask> "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
<mask> "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
<mask> "dev": true
<mask> },
<mask> "micromatch": {
<mask> "version": "4.0.2",
<mask> "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
<mask> "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
<mask> "dev": true,
<mask> "requires": {
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove "version": "4.3.4",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
"integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
"dev": true,
</s> add "version": "6.13.1",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.1.tgz",
"integrity": "sha512-RfoButmcK+yCta1+FuU8REvisx1oEzhMKwhLUNcepQTPGcNMp1sIqjnfCtfnvGSQZQEhaBHvccujtWoUV3TTbA==", </s> remove "version": "1.1.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
"dev": true
</s> add "version": "2.0.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" </s> remove "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
"dev": true
</s> add "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/package-lock.json |
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
}, | <mask> "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
<mask> "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
<mask> "dev": true
<mask> },
<mask> "supports-color": {
<mask> "version": "7.1.0",
<mask> "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
<mask> "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
<mask> "dev": true,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove "version": "1.1.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
"dev": true
</s> add "version": "2.0.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" </s> remove "version": "4.3.4",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
"integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
"dev": true,
</s> add "version": "6.13.1",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.1.tgz",
"integrity": "sha512-RfoButmcK+yCta1+FuU8REvisx1oEzhMKwhLUNcepQTPGcNMp1sIqjnfCtfnvGSQZQEhaBHvccujtWoUV3TTbA==", </s> remove "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
"dev": true
</s> add "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/package-lock.json |
"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" | <mask> },
<mask> "decode-uri-component": {
<mask> "version": "0.2.0",
<mask> "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
<mask> "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
<mask> "dev": true
<mask> },
<mask> "deep-equal": {
<mask> "version": "1.1.1",
<mask> "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
<mask> "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove "version": "1.1.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
"dev": true
</s> add "version": "2.0.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" </s> remove "version": "4.3.4",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
"integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
"dev": true,
</s> add "version": "6.13.1",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.1.tgz",
"integrity": "sha512-RfoButmcK+yCta1+FuU8REvisx1oEzhMKwhLUNcepQTPGcNMp1sIqjnfCtfnvGSQZQEhaBHvccujtWoUV3TTbA==", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/package-lock.json |
"version": "6.13.1",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.1.tgz",
"integrity": "sha512-RfoButmcK+yCta1+FuU8REvisx1oEzhMKwhLUNcepQTPGcNMp1sIqjnfCtfnvGSQZQEhaBHvccujtWoUV3TTbA==", | <mask> "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
<mask> "dev": true
<mask> },
<mask> "query-string": {
<mask> "version": "4.3.4",
<mask> "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
<mask> "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
<mask> "dev": true,
<mask> "requires": {
<mask> "object-assign": "^4.1.0",
<mask> "strict-uri-encode": "^1.0.0"
<mask> }
<mask> },
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove "object-assign": "^4.1.0",
"strict-uri-encode": "^1.0.0"
</s> add "decode-uri-component": "^0.2.0",
"split-on-first": "^1.0.0",
"strict-uri-encode": "^2.0.0" </s> remove "version": "1.1.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
"dev": true
</s> add "version": "2.0.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/package-lock.json |
"decode-uri-component": "^0.2.0",
"split-on-first": "^1.0.0",
"strict-uri-encode": "^2.0.0" | <mask> "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
<mask> "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
<mask> "dev": true,
<mask> "requires": {
<mask> "object-assign": "^4.1.0",
<mask> "strict-uri-encode": "^1.0.0"
<mask> }
<mask> },
<mask> "querystring": {
<mask> "version": "0.2.0",
<mask> "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove "version": "4.3.4",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
"integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
"dev": true,
</s> add "version": "6.13.1",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.1.tgz",
"integrity": "sha512-RfoButmcK+yCta1+FuU8REvisx1oEzhMKwhLUNcepQTPGcNMp1sIqjnfCtfnvGSQZQEhaBHvccujtWoUV3TTbA==", </s> remove "version": "1.1.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
"dev": true
</s> add "version": "2.0.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" </s> remove "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
"dev": true
</s> add "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/package-lock.json |
},
"isobject": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
"dev": true
},
"kind-of": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true | <mask> "is-data-descriptor": "^1.0.0",
<mask> "kind-of": "^6.0.2"
<mask> }
<mask> }
<mask> }
<mask> },
<mask> "snapdragon-util": {
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove "object-assign": "^4.1.0",
"strict-uri-encode": "^1.0.0"
</s> add "decode-uri-component": "^0.2.0",
"split-on-first": "^1.0.0",
"strict-uri-encode": "^2.0.0" </s> remove import debounce from 'lodash/debounce';
import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom'; </s> remove import { getLogsConfig } from '../../actions/queryLogs';
</s> add import {
getLogsConfig,
refreshFilteredLogs,
resetFilteredLogs,
setFilteredLogs,
} from '../../actions/queryLogs'; </s> remove import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/package-lock.json |
"split-on-first": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
"integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="
}, | <mask> "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
<mask> "dev": true
<mask> },
<mask> "split-string": {
<mask> "version": "3.1.0",
<mask> "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
<mask> "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
<mask> "dev": true,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove "version": "4.3.4",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
"integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
"dev": true,
</s> add "version": "6.13.1",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.1.tgz",
"integrity": "sha512-RfoButmcK+yCta1+FuU8REvisx1oEzhMKwhLUNcepQTPGcNMp1sIqjnfCtfnvGSQZQEhaBHvccujtWoUV3TTbA==", </s> remove "version": "1.1.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
"dev": true
</s> add "version": "2.0.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" </s> remove "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
"dev": true
</s> add "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/package-lock.json |
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" | <mask> "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
<mask> "dev": true
<mask> },
<mask> "strict-uri-encode": {
<mask> "version": "1.1.0",
<mask> "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
<mask> "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
<mask> "dev": true
<mask> },
<mask> "string-length": {
<mask> "version": "4.0.1",
<mask> "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
<mask> "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove "version": "4.3.4",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
"integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
"dev": true,
</s> add "version": "6.13.1",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.1.tgz",
"integrity": "sha512-RfoButmcK+yCta1+FuU8REvisx1oEzhMKwhLUNcepQTPGcNMp1sIqjnfCtfnvGSQZQEhaBHvccujtWoUV3TTbA==", </s> remove "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
"dev": true
</s> add "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/package-lock.json |
"query-string": "^6.13.1", | <mask> "ipaddr.js": "^1.9.1",
<mask> "lodash": "^4.17.15",
<mask> "nanoid": "^3.1.9",
<mask> "prop-types": "^15.7.2",
<mask> "react": "^16.13.1",
<mask> "react-click-outside": "^3.0.1",
<mask> "react-dom": "^16.13.1",
<mask> "react-i18next": "^11.4.0",
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove route: MENU_URLS.guide, icon: 'setup', text: 'setup_guide', order: 4,
</s> add route: MENU_URLS.guide,
icon: 'setup',
text: 'setup_guide',
order: 4, </s> remove refreshButton,
subtitle,
dnsQueries,
blockedFiltering,
replacedSafebrowsing,
replacedParental,
replacedSafesearch,
</s> add numDnsQueries,
numBlockedFiltering,
numReplacedSafebrowsing,
numReplacedParental,
numReplacedSafesearch, </s> remove } = props;
</s> add } = useSelector((state) => state.stats, shallowEqual);
const { t } = useTranslation(); </s> remove const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const rows = [
{
label: 'dns_query',
count: numDnsQueries,
tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
response_status: RESPONSE_FILTER.ALL.query,
},
{
label: 'blocked_by',
count: numBlockedFiltering,
tooltipTitle: 'number_of_dns_query_blocked_24_hours',
response_status: RESPONSE_FILTER.BLOCKED.query,
translationComponents: [<a href="#filters" key="0">link</a>],
},
{
label: 'stats_malware_phishing',
count: numReplacedSafebrowsing,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
response_status: RESPONSE_FILTER.BLOCKED_THREATS.query,
},
{
label: 'stats_adult',
count: numReplacedParental,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.query,
},
{
label: 'enforced_save_search',
count: numReplacedSafesearch,
tooltipTitle: 'number_of_dns_query_to_safe_search',
response_status: RESPONSE_FILTER.SAFE_SEARCH.query,
},
{
label: 'average_processing_time',
count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0,
tooltipTitle: 'average_processing_time_hint',
},
]; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/package.json |
"original_response": "Original response",
"click_to_view_queries": "Click to view queries" | <mask> "filter_category_general_desc": "Lists that block tracking and advertising on most of the devices",
<mask> "filter_category_security_desc": "Lists that specialize on blocking malware, phishing or scam domains",
<mask> "filter_category_regional_desc": "Lists that focus on regional ads and tracking servers",
<mask> "filter_category_other_desc": "Other blocklists",
<mask> "original_response": "Original response"
<mask> }
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove export const setLogsFilter = (filter) => async (dispatch) => {
dispatch(setLogsFilterRequest());
</s> add /**
*
* @param filter
* @param {string} filter.search
* @param {string} filter.response_status query field of RESPONSE_FILTER object
* @returns function
*/
export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
export const setFilteredLogs = (filter) => async (dispatch) => {
dispatch(setFilteredLogsRequest()); </s> remove import { getLogsConfig } from '../../actions/queryLogs';
</s> add import {
getLogsConfig,
refreshFilteredLogs,
resetFilteredLogs,
setFilteredLogs,
} from '../../actions/queryLogs'; </s> remove import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; </s> remove import debounce from 'lodash/debounce';
import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom'; </s> remove import { TABLE_DEFAULT_PAGE_SIZE, TABLE_FIRST_PAGE } from '../helpers/constants';
</s> add import {
DEFAULT_LOGS_FILTER,
TABLE_DEFAULT_PAGE_SIZE,
TABLE_FIRST_PAGE,
} from '../helpers/constants'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/__locales/en.json |
import {
DEFAULT_LOGS_FILTER,
TABLE_DEFAULT_PAGE_SIZE,
TABLE_FIRST_PAGE,
} from '../helpers/constants'; | <mask> import { createAction } from 'redux-actions';
<mask>
<mask> import apiClient from '../api/Api';
<mask> import { normalizeLogs, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
<mask> import { TABLE_DEFAULT_PAGE_SIZE, TABLE_FIRST_PAGE } from '../helpers/constants';
<mask> import { addErrorToast, addSuccessToast } from './toasts';
<mask>
<mask> const getLogsWithParams = async (config) => {
<mask> const { older_than, filter, ...values } = config;
<mask> const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
</s> add const rawLogs = await apiClient.getQueryLog({
...filter,
older_than,
}); </s> remove import { setLogsFilter } from '../../../actions/queryLogs';
</s> add </s> remove import { getLogsConfig } from '../../actions/queryLogs';
</s> add import {
getLogsConfig,
refreshFilteredLogs,
resetFilteredLogs,
setFilteredLogs,
} from '../../actions/queryLogs'; </s> remove import { useDispatch } from 'react-redux';
</s> add </s> remove getLogs, setLogsPagination, setLogsFilter, setLogsPage, toggleDetailedLogs,
</s> add getLogs, setLogsPagination, setLogsPage, toggleDetailedLogs, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/actions/queryLogs.js |
const rawLogs = await apiClient.getQueryLog({
...filter,
older_than,
}); | <mask> import { addErrorToast, addSuccessToast } from './toasts';
<mask>
<mask> const getLogsWithParams = async (config) => {
<mask> const { older_than, filter, ...values } = config;
<mask> const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
<mask> const { data, oldest } = rawLogs;
<mask> let logs = normalizeLogs(data);
<mask> const clientsParams = getParamsForClientsSearch(logs, 'client');
<mask>
<mask> if (Object.keys(clientsParams).length > 0) {
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import { TABLE_DEFAULT_PAGE_SIZE, TABLE_FIRST_PAGE } from '../helpers/constants';
</s> add import {
DEFAULT_LOGS_FILTER,
TABLE_DEFAULT_PAGE_SIZE,
TABLE_FIRST_PAGE,
} from '../helpers/constants'; </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); </s> remove logs, oldest, older_than, filter, ...values,
</s> add logs,
oldest,
older_than,
filter,
...values, </s> remove const additionalLogs = await getLogsWithParams({ older_than: oldest, filter });
</s> add const additionalLogs = await getLogsWithParams({
older_than: oldest,
filter,
}); </s> remove const INITIAL_REQUEST = true;
const INITIAL_REQUEST_DATA = ['', TABLE_FIRST_PAGE, INITIAL_REQUEST];
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/actions/queryLogs.js |
logs,
oldest,
older_than,
filter,
...values, | <mask> logs = addClientInfo(logs, clients, 'client');
<mask> }
<mask>
<mask> return {
<mask> logs, oldest, older_than, filter, ...values,
<mask> };
<mask> };
<mask>
<mask> export const getAdditionalLogsRequest = createAction('GET_ADDITIONAL_LOGS_REQUEST');
<mask> export const getAdditionalLogsFailure = createAction('GET_ADDITIONAL_LOGS_FAILURE');
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
</s> add const rawLogs = await apiClient.getQueryLog({
...filter,
older_than,
}); </s> remove export const setLogsFilterFailure = createAction('SET_LOGS_FILTER_FAILURE');
export const setLogsFilterSuccess = createAction('SET_LOGS_FILTER_SUCCESS');
</s> add </s> remove export const setLogsFilter = (filter) => async (dispatch) => {
dispatch(setLogsFilterRequest());
</s> add /**
*
* @param filter
* @param {string} filter.search
* @param {string} filter.response_status query field of RESPONSE_FILTER object
* @returns function
*/
export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
export const setFilteredLogs = (filter) => async (dispatch) => {
dispatch(setFilteredLogsRequest()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/actions/queryLogs.js |
const additionalLogs = await getLogsWithParams({
older_than: oldest,
filter,
}); | <mask> if (needToGetAdditionalLogs) {
<mask> dispatch(getAdditionalLogsRequest());
<mask>
<mask> try {
<mask> const additionalLogs = await getLogsWithParams({ older_than: oldest, filter });
<mask> if (additionalLogs.oldest.length > 0) {
<mask> return await checkFilteredLogs(additionalLogs, filter, dispatch, {
<mask> logs: [...totalData.logs, ...additionalLogs.logs],
<mask> oldest: additionalLogs.oldest,
<mask> });
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const data = await getLogsWithParams({ older_than: '', filter });
</s> add const data = await getLogsWithParams({
older_than: '',
filter,
}); </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); </s> remove const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
</s> add const rawLogs = await apiClient.getQueryLog({
...filter,
older_than,
}); </s> remove dispatch(setLogsFilterSuccess({ ...updatedData, filter }));
</s> add dispatch(setFilteredLogsSuccess({
...updatedData,
filter,
})); </s> remove export const setLogsFilterFailure = createAction('SET_LOGS_FILTER_FAILURE');
export const setLogsFilterSuccess = createAction('SET_LOGS_FILTER_SUCCESS');
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/actions/queryLogs.js |
const data = await getLogsWithParams({
...config,
filter,
}); | <mask> export const getLogs = (config) => async (dispatch, getState) => {
<mask> dispatch(getLogsRequest());
<mask> try {
<mask> const { isFiltered, filter, page } = getState().queryLogs;
<mask> const data = await getLogsWithParams({ ...config, filter });
<mask>
<mask> if (isFiltered) {
<mask> const additionalData = await checkFilteredLogs(data, filter, dispatch);
<mask> const updatedData = additionalData.logs ? { ...data, ...additionalData } : data;
<mask> dispatch(getLogsSuccess(updatedData));
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const data = await getLogsWithParams({ older_than: '', filter });
</s> add const data = await getLogsWithParams({
older_than: '',
filter,
}); </s> remove dispatch(setLogsFilterSuccess({ ...updatedData, filter }));
</s> add dispatch(setFilteredLogsSuccess({
...updatedData,
filter,
})); </s> remove dispatch(setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }));
</s> add dispatch(setLogsPagination({
page,
pageSize: TABLE_DEFAULT_PAGE_SIZE,
})); </s> remove export const setLogsFilter = (filter) => async (dispatch) => {
dispatch(setLogsFilterRequest());
</s> add /**
*
* @param filter
* @param {string} filter.search
* @param {string} filter.response_status query field of RESPONSE_FILTER object
* @returns function
*/
export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
export const setFilteredLogs = (filter) => async (dispatch) => {
dispatch(setFilteredLogsRequest()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/actions/queryLogs.js |
dispatch(setLogsPagination({
page,
pageSize: TABLE_DEFAULT_PAGE_SIZE,
})); | <mask> if (isFiltered) {
<mask> const additionalData = await checkFilteredLogs(data, filter, dispatch);
<mask> const updatedData = additionalData.logs ? { ...data, ...additionalData } : data;
<mask> dispatch(getLogsSuccess(updatedData));
<mask> dispatch(setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }));
<mask> } else {
<mask> dispatch(getLogsSuccess(data));
<mask> }
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove dispatch(setLogsFilterSuccess({ ...updatedData, filter }));
</s> add dispatch(setFilteredLogsSuccess({
...updatedData,
filter,
})); </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); </s> remove const data = await getLogsWithParams({ older_than: '', filter });
</s> add const data = await getLogsWithParams({
older_than: '',
filter,
}); </s> remove dispatch(setLogsFilterFailure(error));
</s> add dispatch(setFilteredLogsFailure(error)); </s> remove export const setLogsFilter = (filter) => async (dispatch) => {
dispatch(setLogsFilterRequest());
</s> add /**
*
* @param filter
* @param {string} filter.search
* @param {string} filter.response_status query field of RESPONSE_FILTER object
* @returns function
*/
export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
export const setFilteredLogs = (filter) => async (dispatch) => {
dispatch(setFilteredLogsRequest()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/actions/queryLogs.js |
<mask> }
<mask> };
<mask>
<mask> export const setLogsFilterRequest = createAction('SET_LOGS_FILTER_REQUEST');
<mask> export const setLogsFilterFailure = createAction('SET_LOGS_FILTER_FAILURE');
<mask> export const setLogsFilterSuccess = createAction('SET_LOGS_FILTER_SUCCESS');
<mask>
<mask> export const setLogsFilter = (filter) => async (dispatch) => {
<mask> dispatch(setLogsFilterRequest());
<mask> try {
<mask> const data = await getLogsWithParams({ older_than: '', filter });
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove export const setLogsFilter = (filter) => async (dispatch) => {
dispatch(setLogsFilterRequest());
</s> add /**
*
* @param filter
* @param {string} filter.search
* @param {string} filter.response_status query field of RESPONSE_FILTER object
* @returns function
*/
export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
export const setFilteredLogs = (filter) => async (dispatch) => {
dispatch(setFilteredLogsRequest()); </s> remove const data = await getLogsWithParams({ older_than: '', filter });
</s> add const data = await getLogsWithParams({
older_than: '',
filter,
}); </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); </s> remove dispatch(setLogsFilterSuccess({ ...updatedData, filter }));
</s> add dispatch(setFilteredLogsSuccess({
...updatedData,
filter,
})); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/actions/queryLogs.js |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.