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

Code before:

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

	// Redacted configuration as a JSON
	jsonConfig, _ := json.MarshalIndent(getRedactedConfig(s), "", "  ")
	arrayFile = append(arrayFile, fileEntry{name: "config.json", data: jsonConfig})

	// 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)
	}
	arrayFile = append(arrayFile, fileEntry{name: "log.txt", data: buflog.Bytes()})

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

	// Errors as a JSON
	if panicFiles, err := filepath.Glob(filepath.Join(baseDirs["config"], "panic*")); err != nil {
		for _, f := range panicFiles {
			panicF, err := ioutil.ReadFile(f)
			if err != nil {
				arrayFile = append(arrayFile, fileEntry{name: filepath.Base(f), data: panicF})
			}
		}
	}

	// Version and platform information as a JSON
	versionPlatform, _ := json.MarshalIndent(map[string]string{
		"version":     Version,
		"codename":    Codename,
		"longVersion": LongVersion,
		"os":          runtime.GOOS,
		"arch":        runtime.GOARCH,
	}, "", "  ")
	arrayFile = append(arrayFile, fileEntry{name: "versionPlatform.json", data: versionPlatform})

	// Report Data as a JSON
	usageReportingData, _ := json.MarshalIndent(reportData(s.cfg, s.model, s.connectionsService, usageReportVersion, true), "", "  ")
	arrayFile = append(arrayFile, fileEntry{name: "usageReportingData.json", data: usageReportingData})

	// Heap and CPU Proofs as a pprof extension
	var heapBuffer, cpuBuffer bytes.Buffer
	filename := fmt.Sprintf("syncthing-heap-%s-%s-%s-%s.pprof", runtime.GOOS, runtime.GOARCH, Version, time.Now().Format("150405")) // hhmmss
	runtime.GC()
	pprof.WriteHeapProfile(&heapBuffer)
	arrayFile = append(arrayFile, fileEntry{name: filename, data: heapBuffer.Bytes()})

Review comment (suggestion):
If condition inverted, we want to do this if `err == nil`. Typical Go way would be to include the assignment in the if,

```
if data, err := ioutil.ReadFile(f); err == nil {
    arrayFile = append(arrayFile, fileEntry{name: filepath.Base(f), data: data})
}
```


Code after:
	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 {
			l.Warnln("Support bundle: failed to create errors.json:", err)
		}
	}

	// Panic files as a JSON
	if panicFiles, err := filepath.Glob(filepath.Join(baseDirs["config"], "panic*")); err == nil {
		for _, f := range panicFiles {
			if panicFile, err := ioutil.ReadFile(f); err != nil {
				l.Warnf("Support bundle: failed to load %s: %s", filepath.Base(f), err)
			} else {
				files = append(files, fileEntry{name: filepath.Base(f), data: panicFile})
			}
		}
	}

	// Version and platform information as a JSON
	if versionPlatform, err := json.MarshalIndent(map[string]string{
		"now":         time.Now().Format(time.RFC3339),
		"version":     Version,