Repository: syncthing/syncthing
File: cmd/syncthing/gui.go (Go)

Code before:
func (s *apiService) getSystemLogTxt(w http.ResponseWriter, r *http.Request) {
	q := r.URL.Query()
	since, err := time.Parse(time.RFC3339, q.Get("since"))
	if err != nil {
		l.Debugln(err)
	}
	w.Header().Set("Content-Type", "text/plain; charset=utf-8")

	for _, line := range s.systemLog.Since(since) {
		fmt.Fprintf(w, "%s: %s\n", line.When.Format(time.RFC3339), line.Message)
	}
}

func (s *apiService) getSupportBundle(w http.ResponseWriter, r *http.Request) {

	jsonConfig, _ := json.MarshalIndent(s.cfg.RawCopy(), "", "	")
	createJSONFile("config.json", jsonConfig)

	jsonLog, _ := json.MarshalIndent(s.systemLog.All(), "", "	")
	createJSONFile("log.json", jsonLog)

	jsonError, _ := json.MarshalIndent(s.guiErrors.All(), "", "	")
	createJSONFile("error.json", jsonError)

	heapRuntime := fmt.Sprintf("syncthing-heap-%s-%s-%s-%s.pprof", runtime.GOOS, runtime.GOARCH, Version, time.Now().Format("150405")) // hhmmss
	createJSONFile("heapRuntime.txt", []byte(heapRuntime))

	t := time.Now().Format("2006-01-02T15.04.05")
	output := t + ".zip"

	path := baseDirs["config"] + "/support_bundle"

	e := os.MkdirAll(path, 0700)
	if e != nil {
		log.Fatalf("MkdirAll %q: %s", path, e)
	}

	newfilepath := path + "/" + output
	newfile, _ := os.Create(newfilepath)
	defer newfile.Close()

	files := []string{"config.json", "log.json", "error.json", "heapRuntime.txt"}
	ZipFiles(newfile, files)
	removeFiles(files)

	from, _ := os.Open(newfilepath)
	w.Header().Set("Content-Disposition", "attachment; filename="+output)
	w.Header().Set("Content-Type", "application/zip")
	io.Copy(w, from)
	sendJSON(w, map[string]string{"file_name": output})
}

Review comment (suggestion):
Not sure what this is. The ticket talks about capturing a heap profile from the runtime, explaining where the memory is allocated. There is probably some way to get a dump summary of the heap too.

Code after:
func (s *apiService) getSystemLog(w http.ResponseWriter, r *http.Request) {
	q := r.URL.Query()
	since, err := time.Parse(time.RFC3339, q.Get("since"))
	if err != nil {
		l.Debugln(err)
	}
	sendJSON(w, map[string][]logger.Line{
		"messages": s.systemLog.Since(since),
	})
}

func (s *apiService) getSystemLogTxt(w http.ResponseWriter, r *http.Request) {
	q := r.URL.Query()
	since, err := time.Parse(time.RFC3339, q.Get("since"))
	if err != nil {
		l.Debugln(err)
	}
	w.Header().Set("Content-Type", "text/plain; charset=utf-8")

	for _, line := range s.systemLog.Since(since) {
		fmt.Fprintf(w, "%s: %s\n", line.When.Format(time.RFC3339), line.Message)
	}
}

type fileEntry struct {
	name string
	data []byte
}

func (s *apiService) getSupportBundle(w http.ResponseWriter, r *http.Request) {
	var files []fileEntry

	// Redacted configuration as a JSON
	if jsonConfig, err := json.MarshalIndent(getRedactedConfig(s), "", "  "); err == nil {
		files = append(files, fileEntry{name: "config.json.txt", data: jsonConfig})
	} else {
		l.Warnln("Support bundle: failed to create config.json:", err)
	}

	// Log as a text
	var buflog bytes.Buffer
	for _, line := range s.systemLog.Since(time.Time{}) {
		fmt.Fprintf(&buflog, "%s: %s\n", line.When.Format(time.RFC3339), line.Message)
	}
	files = append(files, fileEntry{name: "log.txt", data: buflog.Bytes()})

	// Errors as a JSON
	if errs := s.guiErrors.Since(time.Time{}); len(errs) > 0 {
		if jsonError, err := json.MarshalIndent(errs, "", "  "); err != nil {
			files = append(files, fileEntry{name: "errors.json.txt", data: jsonError})
		} else {