octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-08 23:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/syncthing: Minor support bundle tweaks

Browse Source 
- Name the zip file with the short device ID
- Include the log on disk, if there is one
This commit is contained in:
Jakob Borg 2018-10-11 08:13:52 +02:00
parent 83675e7a1d
commit 4f7d43a6dd
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/syncthing/gui.go
View File

@ -1060,7 +1060,7 @@ func (s *apiService) getSupportBundle(w http.ResponseWriter, r *http.Request) {
for _, line := range s.systemLog.Since(time.Time{}) { for _, line := range s.systemLog.Since(time.Time{}) {
fmt.Fprintf(&buflog, "%s: %s\n", line.When.Format(time.RFC3339), line.Message) fmt.Fprintf(&buflog, "%s: %s\n", line.When.Format(time.RFC3339), line.Message)
} }
files = append(files, fileEntry{name: "log.txt", data: buflog.Bytes()}) files = append(files, fileEntry{name: "log-inmemory.txt", data: buflog.Bytes()})
// Errors as a JSON // Errors as a JSON
if errs := s.guiErrors.Since(time.Time{}); len(errs) > 0 { if errs := s.guiErrors.Since(time.Time{}); len(errs) > 0 {
@ -1071,7 +1071,7 @@ func (s *apiService) getSupportBundle(w http.ResponseWriter, r *http.Request) {
} }
} }
// Panic files as a JSON // Panic files
if panicFiles, err := filepath.Glob(filepath.Join(baseDirs["config"], "panic*")); err == nil { if panicFiles, err := filepath.Glob(filepath.Join(baseDirs["config"], "panic*")); err == nil {
for _, f := range panicFiles { for _, f := range panicFiles {
if panicFile, err := ioutil.ReadFile(f); err != nil { if panicFile, err := ioutil.ReadFile(f); err != nil {
@ -1082,6 +1082,11 @@ func (s *apiService) getSupportBundle(w http.ResponseWriter, r *http.Request) {
} }
} }
// Archived log (default on Windows)
if logFile, err := ioutil.ReadFile(locations[locLogFile]); err == nil {
files = append(files, fileEntry{name: "log-ondisk.txt", data: logFile})
}
// Version and platform information as a JSON // Version and platform information as a JSON
if versionPlatform, err := json.MarshalIndent(map[string]string{ if versionPlatform, err := json.MarshalIndent(map[string]string{
"now": time.Now().Format(time.RFC3339), "now": time.Now().Format(time.RFC3339),
@ -1126,7 +1131,7 @@ func (s *apiService) getSupportBundle(w http.ResponseWriter, r *http.Request) {
} }
// Set zip file name and path // Set zip file name and path
zipFileName := fmt.Sprintf("support-bundle-%s.zip", time.Now().Format("2006-01-02T150405")) zipFileName := fmt.Sprintf("support-bundle-%s-%s.zip", s.id.Short().String(), time.Now().Format("2006-01-02T150405"))
zipFilePath := filepath.Join(baseDirs["config"], zipFileName) zipFilePath := filepath.Join(baseDirs["config"], zipFileName)
// Write buffer zip to local zip file (back up) // Write buffer zip to local zip file (back up)