docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> statsJSON, err := json.Marshal(data)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to marshal status json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> return
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(statsJSON)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to write response json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep add keep keep keep keep keep
|
<mask> // -----------------------
<mask>
<mask> func handleSetUpstreamDNS(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Failed to read request body: %s", err)
<mask> log.Error(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> func handleSetUpstreamDNS(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Failed to read request body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
<mask> return
<mask> }
<mask> // if empty body -- user is asking for default servers
<mask> hosts := strings.Fields(string(body))
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> err = writeAllConfigs()
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> err = reconfigureDNSServer()
<mask> if err != nil {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove
</s> add log.Error("Couldn't write all configs: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Couldn't write config: %s", err)
</s> add log.Error("Couldn't write config: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> err = reconfigureDNSServer()
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't reconfigure the DNS server: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> _, err = fmt.Fprintf(w, "OK %d servers\n", len(hosts))
<mask> if err != nil {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> _, err = fmt.Fprintf(w, "OK %d servers\n", len(hosts))
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> }
<mask> }
<mask>
<mask> func handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep add keep keep keep keep keep keep
|
<mask> }
<mask> }
<mask>
<mask> func handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Failed to read request body: %s", err)
<mask> log.Error(errorText)
<mask> http.Error(w, errorText, 400)
<mask> return
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> func handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Failed to read request body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 400)
<mask> return
<mask> }
<mask> hosts := strings.Fields(string(body))
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> hosts := strings.Fields(string(body))
<mask>
<mask> if len(hosts) == 0 {
<mask> errorText := fmt.Sprintf("No servers specified")
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> result := map[string]string{}
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> for _, host := range hosts {
<mask> err = checkDNS(host)
<mask> if err != nil {
<mask> log.Println(err)
<mask> result[host] = err.Error()
<mask> } else {
<mask> result[host] = "OK"
<mask> }
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Failed to marshal entry: %s", err)
</s> add log.Error("Failed to marshal entry: %s", err) </s> remove log.Printf("ERROR: Got %s without argument\n", v)
</s> add log.Error("Got %s without argument\n", v) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Printf("Couldn't close gzip writer: %s", err)
</s> add log.Error("Couldn't close gzip writer: %s", err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> jsonVal, err := json.Marshal(result)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to marshal status json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> return
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(jsonVal)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> }
<mask> }
<mask>
<mask> func checkDNS(input string) error {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> }
<mask>
<mask> func checkDNS(input string) error {
<mask> log.Printf("Checking if DNS %s works...", input)
<mask> u, err := upstream.AddressToUpstream(input, upstream.Options{Timeout: dnsforward.DefaultTimeout})
<mask> if err != nil {
<mask> return fmt.Errorf("failed to choose upstream for %s: %s", input, err)
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove log.Printf("DNS %s works OK", input)
</s> add log.Debug("DNS %s works OK", input) </s> remove log.Printf("Stopping AdGuard Home")
</s> add log.Info("Stopping AdGuard Home") </s> remove log.Printf("Failed to rename querylog: %s", err)
</s> add log.Error("Failed to rename querylog: %s", err) </s> remove log.Printf("Couldn't write config: %s", err)
</s> add log.Error("Couldn't write config: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return fmt.Errorf("DNS server %s returned wrong answer: %v", input, t.A)
<mask> }
<mask> }
<mask>
<mask> log.Printf("DNS %s works OK", input)
<mask> return nil
<mask> }
<mask>
<mask> func handleGetVersionJSON(w http.ResponseWriter, r *http.Request) {
<mask> now := time.Now()
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Checking if DNS %s works...", input)
</s> add log.Debug("Checking if DNS %s works...", input) </s> add log.Tracef("") </s> remove log.Printf("Rotated from %s to %s successfully", from, to)
</s> add log.Debug("Rotated from %s to %s successfully", from, to) </s> remove log.Printf("Failed to rename querylog: %s", err)
</s> add log.Error("Failed to rename querylog: %s", err) </s> remove log.Printf("ERROR: Got %s without argument\n", v)
</s> add log.Error("Got %s without argument\n", v) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep add keep keep keep keep
|
<mask>
<mask> func handleGetVersionJSON(w http.ResponseWriter, r *http.Request) {
<mask> now := time.Now()
<mask> if now.Sub(versionCheckLastTime) <= versionCheckPeriod && len(versionCheckJSON) != 0 {
<mask> // return cached copy
<mask> w.Header().Set("Content-Type", "application/json")
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("DNS %s works OK", input)
</s> add log.Debug("DNS %s works OK", input) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Verbose = ls.Verbose
</s> add level := log.INFO
if ls.Verbose {
level = log.DEBUG
}
log.SetLevel(level) </s> remove log.Printf("ERROR: Got %s without argument\n", v)
</s> add log.Error("Got %s without argument\n", v) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> resp, err := client.Get(versionCheckURL)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't get version check json from %s: %T %s\n", versionCheckURL, err, err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadGateway)
<mask> return
<mask> }
<mask> if resp != nil && resp.Body != nil {
<mask> defer resp.Body.Close()
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // read the body entirely
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't read response body from %s: %s", versionCheckURL, err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadGateway)
<mask> return
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> }
<mask>
<mask> versionCheckLastTime = now
<mask> versionCheckJSON = body
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep add keep keep keep keep
|
<mask>
<mask> func handleFilteringEnable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.FilteringEnabled = true
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep add keep keep keep keep keep keep
|
<mask>
<mask> func handleFilteringDisable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.FilteringEnabled = false
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("")
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep add keep keep keep keep
|
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
<mask> data := map[string]interface{}{
<mask> "enabled": config.DNS.FilteringEnabled,
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> config.RUnlock()
<mask>
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to marshal status json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 500)
<mask> return
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(jsonVal)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to write response json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 500)
<mask> return
<mask> }
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep add keep keep keep keep
|
<mask> }
<mask> }
<mask>
<mask> func handleFilteringAddURL(w http.ResponseWriter, r *http.Request) {
<mask> f := filter{}
<mask> err := json.NewDecoder(r.Body).Decode(&f)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to parse request body json: %s", err)
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // Check for duplicates
<mask> for i := range config.Filters {
<mask> if config.Filters[i].URL == f.URL {
<mask> errorText := fmt.Sprintf("Filter URL already added -- %s", f.URL)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
<mask> return
<mask> }
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Printf("Failed to marshal entry: %s", err)
</s> add log.Error("Failed to marshal entry: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // Download the filter contents
<mask> ok, err := f.update(true)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't fetch filter from url %s: %s", f.URL, err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
<mask> return
<mask> }
<mask> if f.RulesCount == 0 {
<mask> errorText := fmt.Sprintf("Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
</s> add log.Debug("Couldn't load filter %d contents due to %s", filter.ID, err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return
<mask> }
<mask> if f.RulesCount == 0 {
<mask> errorText := fmt.Sprintf("Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
<mask> return
<mask> }
<mask> if !ok {
<mask> errorText := fmt.Sprintf("Filter at the url %s is invalid (maybe it points to blank page?)", f.URL)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
</s> add log.Debug("Couldn't load filter %d contents due to %s", filter.ID, err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return
<mask> }
<mask> if !ok {
<mask> errorText := fmt.Sprintf("Filter at the url %s is invalid (maybe it points to blank page?)", f.URL)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> // Save the filter contents
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
</s> add log.Debug("Couldn't load filter %d contents due to %s", filter.ID, err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // Save the filter contents
<mask> err = f.save()
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Failed to save filter %d due to %s", f.ID, err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> // URL is deemed valid, append it to filters, update config, write new filter file and tell dns to reload it
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
</s> add log.Debug("Couldn't load filter %d contents due to %s", filter.ID, err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> config.Filters = append(config.Filters, f)
<mask> err = writeAllConfigs()
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> return
<mask> }
<mask>
<mask> err = reconfigureDNSServer()
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove
</s> add log.Error("Couldn't write all configs: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> err = reconfigureDNSServer()
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't reconfigure the DNS server: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> }
<mask>
<mask> _, err = fmt.Fprintf(w, "OK %d rules\n", f.RulesCount)
<mask> if err != nil {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> _, err = fmt.Fprintf(w, "OK %d rules\n", f.RulesCount)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> }
<mask> }
<mask>
<mask> func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep add keep keep keep keep keep keep
|
<mask>
<mask> func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("failed to parse parameters from body: %s", err)
<mask> log.Error(errorText)
<mask> http.Error(w, errorText, 400)
<mask> return
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("failed to parse parameters from body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 400)
<mask> return
<mask> }
<mask>
<mask> url, ok := parameters["url"]
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep add keep keep keep keep
|
<mask> }
<mask>
<mask> func handleFilteringEnableURL(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("failed to parse parameters from body: %s", err)
<mask> log.Error(errorText)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> func handleFilteringEnableURL(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("failed to parse parameters from body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 400)
<mask> return
<mask> }
<mask>
<mask> url, ok := parameters["url"]
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep add keep keep keep keep keep
|
<mask> }
<mask>
<mask> func handleFilteringDisableURL(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("failed to parse parameters from body: %s", err)
<mask> log.Error(errorText)
<mask> http.Error(w, errorText, 400)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> func handleFilteringDisableURL(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("failed to parse parameters from body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 400)
<mask> return
<mask> }
<mask>
<mask> url, ok := parameters["url"]
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep add keep keep keep keep
|
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Failed to read request body: %s", err)
<mask> log.Error(errorText)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Failed to read request body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 400)
<mask> return
<mask> }
<mask>
<mask> config.UserRules = strings.Split(string(body), "\n")
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep add keep keep keep keep
|
<mask>
<mask> func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
<mask> force := r.URL.Query().Get("force")
<mask> updated := refreshFiltersIfNecessary(force != "")
<mask> fmt.Fprintf(w, "OK %d filters updated\n", updated)
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep add keep keep keep keep keep
|
<mask>
<mask> func handleSafeBrowsingEnable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.SafeBrowsingEnabled = true
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleSafeBrowsingDisable(w http.ResponseWriter, r *http.Request) {
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep add keep keep keep keep
|
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleSafeBrowsingDisable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.SafeBrowsingEnabled = false
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep add keep keep keep keep keep keep
|
<mask> }
<mask>
<mask> func handleSafeBrowsingStatus(w http.ResponseWriter, r *http.Request) {
<mask> data := map[string]interface{}{
<mask> "enabled": config.DNS.SafeBrowsingEnabled,
<mask> }
<mask> jsonVal, err := json.Marshal(data)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to marshal status json: %s", err)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> jsonVal, err := json.Marshal(data)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to marshal status json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 500)
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(jsonVal)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(jsonVal)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to write response json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 500)
<mask> return
<mask> }
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep add keep keep keep keep keep keep
|
<mask> // --------
<mask> // parental
<mask> // --------
<mask> func handleParentalEnable(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("failed to parse parameters from body: %s", err)
<mask> log.Error(errorText)
<mask> http.Error(w, errorText, 400)
<mask> return
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> func handleParentalEnable(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("failed to parse parameters from body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 400)
<mask> return
<mask> }
<mask>
<mask> sensitivity, ok := parameters["sensitivity"]
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep add keep keep keep keep
|
<mask> }
<mask>
<mask> func handleParentalDisable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.ParentalEnabled = false
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep add keep keep keep keep keep keep
|
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleParentalStatus(w http.ResponseWriter, r *http.Request) {
<mask> data := map[string]interface{}{
<mask> "enabled": config.DNS.ParentalEnabled,
<mask> }
<mask> if config.DNS.ParentalEnabled {
<mask> data["sensitivity"] = config.DNS.ParentalSensitivity
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> jsonVal, err := json.Marshal(data)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to marshal status json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 500)
<mask> return
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(jsonVal)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to write response json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 500)
<mask> return
<mask> }
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep add keep keep keep keep
|
<mask>
<mask> func handleSafeSearchEnable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.SafeSearchEnabled = true
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep add keep keep keep keep
|
<mask>
<mask> func handleSafeSearchDisable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.SafeSearchEnabled = false
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep add keep keep keep keep
|
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleSafeSearchStatus(w http.ResponseWriter, r *http.Request) {
<mask> data := map[string]interface{}{
<mask> "enabled": config.DNS.SafeSearchEnabled,
<mask> }
<mask> jsonVal, err := json.Marshal(data)
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> jsonVal, err := json.Marshal(data)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to marshal status json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 500)
<mask> return
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
</s> * use new logger - AdguardTeam/golibs/log
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(jsonVal)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to write response json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 500)
<mask> return
<mask> }
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep add keep keep keep keep keep keep
|
<mask> }
<mask>
<mask> func handleInstallGetAddresses(w http.ResponseWriter, r *http.Request) {
<mask> data := firstRunData{}
<mask>
<mask> // find out if port 80 is available -- if not, fall back to 3000
<mask> if checkPortAvailable("", 80) == nil {
<mask> data.Web.Port = 80
<mask> } else {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("ERROR: Got %s without argument\n", v)
</s> add log.Error("Got %s without argument\n", v) </s> remove log.Verbose = ls.Verbose
</s> add level := log.INFO
if ls.Verbose {
level = log.DEBUG
}
log.SetLevel(level) </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep add keep keep keep keep keep keep
|
<mask>
<mask> func handleInstallConfigure(w http.ResponseWriter, r *http.Request) {
<mask> newSettings := firstRunData{}
<mask> err := json.NewDecoder(r.Body).Decode(&newSettings)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to parse new config json: %s", err)
<mask> return
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> remove
</s> add log.Error("Couldn't write all configs: %s", err) </s> add log.Tracef("") </s> remove log.Printf("Couldn't parse config file: %s", err)
</s> add log.Error("Couldn't parse config file: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep add keep keep keep keep keep keep
|
<mask> // ---
<mask> func handleTLSStatus(w http.ResponseWriter, r *http.Request) {
<mask> marshalTLS(w, config.TLS)
<mask> }
<mask>
<mask> func handleTLSValidate(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("")
<mask> data, err := unmarshalTLS(r)
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep add keep keep keep keep keep
|
<mask> marshalTLS(w, config.TLS)
<mask> }
<mask>
<mask> func handleTLSValidate(w http.ResponseWriter, r *http.Request) {
<mask> data, err := unmarshalTLS(r)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to unmarshal TLS config: %s", err)
<mask> return
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Printf("Couldn't write config: %s", err)
</s> add log.Error("Couldn't write config: %s", err) </s> remove log.Printf("Couldn't save YAML config: %s", err)
</s> add log.Error("Couldn't save YAML config: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep add keep keep keep keep
|
<mask> marshalTLS(w, data)
<mask> }
<mask>
<mask> func handleTLSConfigure(w http.ResponseWriter, r *http.Request) {
<mask> data, err := unmarshalTLS(r)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to unmarshal TLS config: %s", err)
<mask> return
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Printf("Couldn't write config: %s", err)
</s> add log.Error("Couldn't write config: %s", err) </s> remove log.Printf("Couldn't save YAML config: %s", err)
</s> add log.Error("Couldn't save YAML config: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep add keep keep keep keep
|
<mask> // --------------
<mask> func handleDOH(w http.ResponseWriter, r *http.Request) {
<mask> if r.TLS == nil {
<mask> httpError(w, http.StatusNotFound, "Not Found")
<mask> return
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Printf("ERROR: Got %s without argument\n", v)
</s> add log.Error("Got %s without argument\n", v)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/hmage/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> var dhcpServer = dhcpd.Server{}
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add </s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dhcp.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> if !newconfig.Enabled {
<mask> err := dhcpServer.Stop()
<mask> if err != nil {
<mask> log.Printf("failed to stop the DHCP server: %s", err)
<mask> }
<mask> }
<mask> config.DHCP = newconfig
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove log.Printf("Couldn't stop DHCP server: %s", err)
</s> add log.Error("Couldn't stop DHCP server: %s", err) </s> remove log.Printf("Stopping AdGuard Home")
</s> add log.Info("Stopping AdGuard Home") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("")
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dhcp.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> func handleDHCPFindActiveServer(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("failed to read request body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> interfaceName := strings.TrimSpace(string(body))
</s> * use new logger - AdguardTeam/golibs/log </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dhcp.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> interfaceName := strings.TrimSpace(string(body))
<mask> if interfaceName == "" {
<mask> errorText := fmt.Sprintf("empty interface name specified")
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
<mask> return
<mask> }
<mask> found, err := dhcpd.CheckIfOtherDHCPServersPresent(interfaceName)
<mask> result := map[string]interface{}{}
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dhcp.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "net"
<mask> "os"
<mask> "time"
<mask>
<mask> "github.com/hmage/golibs/log"
<mask> "github.com/krolaw/dhcp4"
<mask> )
<mask>
<mask> // CheckIfOtherDHCPServersPresent sends a DHCP request to the specified network interface,
<mask> // and waits for a response for a period defined by defaultDiscoverTime
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove log.Printf("AdGuard Home is running as a service")
</s> add log.Info("AdGuard Home is running as a service") </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove log.Verbose = ls.Verbose
</s> add level := log.INFO
if ls.Verbose {
level = log.DEBUG
}
log.SetLevel(level) </s> remove log.Tracef("Current working directory is %s", config.ourWorkingDir)
</s> add log.Debug("Current working directory is %s", config.ourWorkingDir)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dhcpd/check_other_dhcp.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "net"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/hmage/golibs/log"
<mask> "github.com/krolaw/dhcp4"
<mask> )
<mask>
<mask> const defaultDiscoverTime = time.Second * 3
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dhcpd/dhcpd.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import (
<mask> "fmt"
<mask> "net"
<mask>
<mask> "github.com/hmage/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> func isTimeout(err error) bool {
<mask> operr, ok := err.(*net.OpError)
</s> * use new logger - AdguardTeam/golibs/log </s> remove stdlog "log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dhcpd/helpers.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "syscall"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/hmage/golibs/log"
<mask> "github.com/krolaw/dhcp4"
<mask> )
<mask>
<mask> func main() {
<mask> if len(os.Args) < 2 {
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove
"github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dhcpd/standalone/main.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/hmage/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> var dnsServer *dnsforward.Server
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dns.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "sync/atomic"
<mask> "time"
<mask>
<mask> "github.com/bluele/gcache"
<mask> "github.com/hmage/golibs/log"
<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 logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "fmt"
<mask> "os"
<mask> "runtime"
<mask>
<mask> "github.com/hmage/golibs/log"
<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 logger - AdguardTeam/golibs/log </s> remove log.Tracef("Silently refusing to write config because first run and not configured yet")
</s> add log.Debug("Silently refusing to write config because first run and not configured yet") </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove log.Tracef("Writing YAML file: %s", configFile)
</s> add log.Debug("Writing YAML file: %s", configFile) </s> remove stdlog "log"
</s> add </s> remove log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
</s> add log.Debug("Couldn't load filter %d contents due to %s", filter.ID, err) </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsfilter/dnsfilter_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/hmage/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // DefaultTimeout is the default upstream timeout
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/dnsforward.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/hmage/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> const (
<mask> logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog.go
|
keep keep add keep keep keep keep
|
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/go-test/deep"
<mask> )
<mask>
<mask> var (
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add </s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/go-test/deep"
<mask> "github.com/hmage/golibs/log"
<mask> )
<mask>
<mask> var (
<mask> fileWriteLock sync.Mutex
<mask> )
</s> * use new logger - AdguardTeam/golibs/log </s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> l.logBuffer = nil
<mask> l.logBufferLock.Unlock()
<mask> err := l.flushToFile(flushBuffer)
<mask> if err != nil {
<mask> log.Printf("Saving querylog to file failed: %s", err)
<mask> return err
<mask> }
<mask> return nil
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("YAML file doesn't exist, skipping it")
</s> add log.Error("YAML file doesn't exist, skipping it") </s> remove log.Printf("Failed to open file \"%s\": %s", file, err)
</s> add log.Error("Failed to open file \"%s\": %s", file, err) </s> remove log.Printf("Couldn't read config file: %s", err)
</s> add log.Error("Couldn't read config file: %s", err) </s> remove log.Printf("failed to create file \"%s\": %s", filename, err)
</s> add log.Error("failed to create file \"%s\": %s", filename, err) </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove log.Printf("Couldn't save YAML config: %s", err)
</s> add log.Error("Couldn't save YAML config: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> e := json.NewEncoder(&b)
<mask> for _, entry := range buffer {
<mask> err := e.Encode(entry)
<mask> if err != nil {
<mask> log.Printf("Failed to marshal entry: %s", err)
<mask> return err
<mask> }
<mask> }
<mask>
<mask> elapsed := time.Since(start)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove log.Println(err)
</s> add log.Info("%v", err) </s> remove log.Printf("decoded buffer differs: %s", diff)
</s> add log.Error("decoded buffer differs: %s", diff) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep replace keep keep keep replace keep keep keep keep
|
<mask> }
<mask>
<mask> elapsed := time.Since(start)
<mask> log.Printf("%d elements serialized via json in %v: %d kB, %v/entry, %v/entry", len(buffer), elapsed, b.Len()/1024, float64(b.Len())/float64(len(buffer)), elapsed/time.Duration(len(buffer)))
<mask>
<mask> err := checkBuffer(buffer, b)
<mask> if err != nil {
<mask> log.Printf("failed to check buffer: %s", err)
<mask> return err
<mask> }
<mask>
<mask> var zb bytes.Buffer
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Failed to marshal entry: %s", err)
</s> add log.Error("Failed to marshal entry: %s", err) </s> remove log.Printf("file \"%s\": read %d entries in %v, %v/entry, %v over %v, %v avg", file, i, elapsed, perunit, over, max, avg)
</s> add log.Debug("file \"%s\": read %d entries in %v, %v/entry, %v over %v, %v avg", file, i, elapsed, perunit, over, max, avg) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("failed to stop the DHCP server: %s", err)
</s> add log.Error("failed to stop the DHCP server: %s", err) </s> remove log.Printf("Couldn't close gzip writer: %s", err)
</s> add log.Error("Couldn't close gzip writer: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> zw.ModTime = time.Now()
<mask>
<mask> _, err = zw.Write(b.Bytes())
<mask> if err != nil {
<mask> log.Printf("Couldn't compress to gzip: %s", err)
<mask> zw.Close()
<mask> return err
<mask> }
<mask>
<mask> if err = zw.Close(); err != nil {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't close gzip writer: %s", err)
</s> add log.Error("Couldn't close gzip writer: %s", err) </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove log.Printf("Couldn't save YAML config: %s", err)
</s> add log.Error("Couldn't save YAML config: %s", err) </s> remove log.Printf("Couldn't generate YAML file: %s", err)
</s> add log.Error("Couldn't generate YAML file: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return err
<mask> }
<mask>
<mask> if err = zw.Close(); err != nil {
<mask> log.Printf("Couldn't close gzip writer: %s", err)
<mask> return err
<mask> }
<mask> } else {
<mask> zb = b
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) </s> remove log.Printf("Couldn't compress to gzip: %s", err)
</s> add log.Error("Couldn't compress to gzip: %s", err) </s> remove log.Printf("Couldn't save YAML config: %s", err)
</s> add log.Error("Couldn't save YAML config: %s", err) </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove log.Println(err)
</s> add log.Info("%v", err) </s> remove log.Printf("Couldn't stop DHCP server: %s", err)
</s> add log.Error("Couldn't stop DHCP server: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> fileWriteLock.Lock()
<mask> defer fileWriteLock.Unlock()
<mask> f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
<mask> if err != nil {
<mask> log.Printf("failed to create file \"%s\": %s", filename, err)
<mask> return err
<mask> }
<mask> defer f.Close()
<mask>
<mask> n, err := f.Write(zb.Bytes())
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't write to file: %s", err)
</s> add log.Error("Couldn't write to file: %s", err) </s> remove log.Printf("Failed to open file \"%s\": %s", file, err)
</s> add log.Error("Failed to open file \"%s\": %s", file, err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) </s> remove stdlog.SetOutput(file)
</s> add log.SetOutput(file) </s> remove log.Printf("Saving querylog to file failed: %s", err)
</s> add log.Error("Saving querylog to file failed: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep replace keep keep keep keep
|
<mask> defer f.Close()
<mask>
<mask> n, err := f.Write(zb.Bytes())
<mask> if err != nil {
<mask> log.Printf("Couldn't write to file: %s", err)
<mask> return err
<mask> }
<mask>
<mask> log.Printf("ok \"%s\": %v bytes written", filename, n)
<mask>
<mask> return nil
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("failed to create file \"%s\": %s", filename, err)
</s> add log.Error("failed to create file \"%s\": %s", filename, err) </s> remove log.Printf("Failed to open file \"%s\": %s", file, err)
</s> add log.Error("Failed to open file \"%s\": %s", file, err) </s> remove log.Printf("Couldn't generate YAML file: %s", err)
</s> add log.Error("Couldn't generate YAML file: %s", err) </s> remove log.Tracef("Writing YAML file: %s", configFile)
</s> add log.Debug("Writing YAML file: %s", configFile) </s> remove log.Printf("Couldn't parse config file: %s", err)
</s> add log.Error("Couldn't parse config file: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep replace keep keep keep
|
<mask> for d.More() {
<mask> entry := &logEntry{}
<mask> err := d.Decode(entry)
<mask> if err != nil {
<mask> log.Printf("Failed to decode: %s", err)
<mask> return err
<mask> }
<mask> if diff := deep.Equal(entry, buffer[i]); diff != nil {
<mask> log.Printf("decoded buffer differs: %s", diff)
<mask> return fmt.Errorf("decoded buffer differs: %s", diff)
<mask> }
<mask> i++
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Failed to marshal entry: %s", err)
</s> add log.Error("Failed to marshal entry: %s", err) </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep replace keep
|
<mask> i++
<mask> }
<mask> if i != l {
<mask> err := fmt.Errorf("check fail: %d vs %d entries", l, i)
<mask> log.Print(err)
<mask> return err
<mask> }
<mask> log.Printf("check ok: %d entries", i)
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("decoded buffer differs: %s", diff)
</s> add log.Error("decoded buffer differs: %s", diff) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep replace keep keep keep replace keep keep keep keep
|
<mask>
<mask> err := os.Rename(from, to)
<mask> if err != nil {
<mask> log.Printf("Failed to rename querylog: %s", err)
<mask> return err
<mask> }
<mask>
<mask> log.Printf("Rotated from %s to %s successfully", from, to)
<mask>
<mask> return nil
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Printf("Checking if DNS %s works...", input)
</s> add log.Debug("Checking if DNS %s works...", input) </s> remove log.Printf("Failed to marshal entry: %s", err)
</s> add log.Error("Failed to marshal entry: %s", err) </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> func (l *queryLog) periodicQueryLogRotate() {
<mask> for range time.Tick(queryLogRotationPeriod) {
<mask> err := l.rotateQueryLog()
<mask> if err != nil {
<mask> log.Printf("Failed to rotate querylog: %s", err)
<mask> // do nothing, continue rotating
<mask> }
<mask> }
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Rotated from %s to %s successfully", from, to)
</s> add log.Debug("Rotated from %s to %s successfully", from, to) </s> remove log.Printf("Failed to marshal entry: %s", err)
</s> add log.Error("Failed to marshal entry: %s", err) </s> remove log.Printf("Failed to rename querylog: %s", err)
</s> add log.Error("Failed to rename querylog: %s", err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove log.Println(err)
</s> add log.Info("%v", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> f, err := os.Open(file)
<mask> if err != nil {
<mask> log.Printf("Failed to open file \"%s\": %s", file, err)
<mask> // try next file
<mask> continue
<mask> }
<mask> defer f.Close()
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("failed to create file \"%s\": %s", filename, err)
</s> add log.Error("failed to create file \"%s\": %s", filename, err) </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove log.Printf("Couldn't write to file: %s", err)
</s> add log.Error("Couldn't write to file: %s", err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) </s> remove log.Printf("Saving querylog to file failed: %s", err)
</s> add log.Error("Saving querylog to file failed: %s", err) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> if enableGzip {
<mask> zr, err := gzip.NewReader(f)
<mask> if err != nil {
<mask> log.Printf("Failed to create gzip reader: %s", err)
<mask> continue
<mask> }
<mask> defer zr.Close()
<mask> d = json.NewDecoder(zr)
<mask> } else {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't close gzip writer: %s", err)
</s> add log.Error("Couldn't close gzip writer: %s", err) </s> remove log.Printf("Failed to open file \"%s\": %s", file, err)
</s> add log.Error("Failed to open file \"%s\": %s", file, err) </s> remove log.Printf("failed to create file \"%s\": %s", filename, err)
</s> add log.Error("failed to create file \"%s\": %s", filename, err) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove stdlog.SetOutput(file)
</s> add log.SetOutput(file)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> var entry logEntry
<mask> err := d.Decode(&entry)
<mask> if err != nil {
<mask> log.Printf("Failed to decode: %s", err)
<mask> // next entry can be fine, try more
<mask> continue
<mask> }
<mask>
<mask> if now.Sub(entry.Time) > timeWindow {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove log.Printf("Failed to open file \"%s\": %s", file, err)
</s> add log.Error("Failed to open file \"%s\": %s", file, err) </s> remove log.Printf("Failed to marshal entry: %s", err)
</s> add log.Error("Failed to marshal entry: %s", err) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) </s> remove log.Printf("decoded buffer differs: %s", diff)
</s> add log.Error("decoded buffer differs: %s", diff)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep
|
<mask> if i > 0 {
<mask> perunit = elapsed / time.Duration(i)
<mask> avg = sum / time.Duration(i)
<mask> }
<mask> log.Printf("file \"%s\": read %d entries in %v, %v/entry, %v over %v, %v avg", file, i, elapsed, perunit, over, max, avg)
<mask> }
<mask> return nil
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("%d elements serialized via json in %v: %d kB, %v/entry, %v/entry", len(buffer), elapsed, b.Len()/1024, float64(b.Len())/float64(len(buffer)), elapsed/time.Duration(len(buffer)))
</s> add log.Debug("%d elements serialized via json in %v: %d kB, %v/entry, %v/entry", len(buffer), elapsed, b.Len()/1024, float64(b.Len())/float64(len(buffer)), elapsed/time.Duration(len(buffer))) </s> remove log.Printf("ok \"%s\": %v bytes written", filename, n)
</s> add log.Debug("ok \"%s\": %v bytes written", filename, n) </s> remove log.Printf("Failed to open file \"%s\": %s", file, err)
</s> add log.Error("Failed to open file \"%s\": %s", file, err) </s> remove log.Printf("Couldn't write to file: %s", err)
</s> add log.Error("Couldn't write to file: %s", err) </s> remove log.Printf("failed to check buffer: %s", err)
</s> add log.Error("failed to check buffer: %s", err) </s> remove log.Print(err)
</s> add log.Error("%v", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_file.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/bluele/gcache"
<mask> "github.com/hmage/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> type hourTop struct {
<mask> domains gcache.Cache
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
dnsforward/querylog_top.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/hmage/golibs/log"
<mask> )
<mask>
<mask> var (
<mask> nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
<mask> filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
filter.go
|
keep add keep keep keep keep
|
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.11.1
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect
<mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7
<mask> github.com/go-ole/go-ole v1.2.1 // indirect
<mask> github.com/go-test/deep v1.0.1
</s> * use new logger - AdguardTeam/golibs/log </s> remove github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
go.mod
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7
<mask> github.com/go-ole/go-ole v1.2.1 // indirect
<mask> github.com/go-test/deep v1.0.1
<mask> github.com/gobuffalo/packr v1.19.0
<mask> github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24
<mask> github.com/joomcode/errorx v0.1.0
<mask> github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
<mask> github.com/kardianos/service v0.0.0-20181115005516-4c239ee84e7b
<mask> github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414
<mask> github.com/miekg/dns v1.1.1
</s> * use new logger - AdguardTeam/golibs/log </s> add github.com/AdguardTeam/golibs v0.1 </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> add log.Tracef("") </s> add log.Tracef("") </s> remove log.Println(text)
</s> add log.Info(text) </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
go.mod
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> import (
<mask> "testing"
<mask>
<mask> "github.com/hmage/golibs/log"
<mask> )
<mask>
<mask> func TestGetValidNetInterfacesForWeb(t *testing.T) {
<mask> ifaces, err := getValidNetInterfacesForWeb()
<mask> if err != nil {
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Couldn't write config: %s", err)
</s> add log.Error("Couldn't write config: %s", err)
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
helpers_test.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "io/ioutil"
<mask> "net/http"
<mask> "strings"
<mask>
<mask> "github.com/hmage/golibs/log"
<mask> )
<mask>
<mask> // --------------------
<mask> // internationalization
<mask> // --------------------
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log"
|
https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0
|
i18n.go
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.