Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-18 08:06:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-2046: bridge-gui log is included in optional archive sent with bug reports.

Browse Source
This commit is contained in:
Xavier Michelon
2022-11-08 17:08:14 +01:00
committed by Romain LE JEUNE
parent 3b9a3aaad2
commit 19930f63e2
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/bridge/bug_report.go
View File

@ -39,7 +39,7 @@ const (
var ErrSizeTooLarge = errors.New("file is too big") var ErrSizeTooLarge = errors.New("file is too big")
// ReportBug reports a new bug from the user. // ReportBug reports a new bug from the user.
func (b *Bridge) ReportBug(osType, osVersion, description, accountName, address, emailClient string, attachLogs bool) error { func (b *Bridge) ReportBug(osType, osVersion, description, accountName, address, emailClient string, attachLogs bool) error { //nolint:funlen
if user, err := b.GetUser(address); err == nil { if user, err := b.GetUser(address); err == nil {
accountName = user.Username() accountName = user.Username()
} else if users := b.GetUsers(); len(users) > 0 { } else if users := b.GetUsers(); len(users) > 0 {
@ -65,6 +65,16 @@ func (b *Bridge) ReportBug(osType, osVersion, description, accountName, address,
if err != nil { if err != nil {
log.WithError(err).Error("Can't get log files list") log.WithError(err).Error("Can't get log files list")
} }
guiLogs, err := b.getMatchingLogs(
func(filename string) bool {
return logging.MatchGUILogName(filename) && !logging.MatchStackTraceName(filename)
},
)
if err != nil {
log.WithError(err).Error("Can't get GUI log files list")
}
crashes, err := b.getMatchingLogs( crashes, err := b.getMatchingLogs(
func(filename string) bool { func(filename string) bool {
return logging.MatchLogName(filename) && logging.MatchStackTraceName(filename) return logging.MatchLogName(filename) && logging.MatchStackTraceName(filename)
@ -78,6 +88,10 @@ func (b *Bridge) ReportBug(osType, osVersion, description, accountName, address,
matchFiles = append(matchFiles, logs[max(0, len(logs)-(MaxCompressedFilesCount/2)):]...) matchFiles = append(matchFiles, logs[max(0, len(logs)-(MaxCompressedFilesCount/2)):]...)
matchFiles = append(matchFiles, crashes[max(0, len(crashes)-(MaxCompressedFilesCount/2)):]...) matchFiles = append(matchFiles, crashes[max(0, len(crashes)-(MaxCompressedFilesCount/2)):]...)
if len(guiLogs) > 0 {
// bridge-gui is keeping only one log file and it's small (~ 1kb), so we include it regardless of file count
matchFiles = append(matchFiles, guiLogs[len(guiLogs)-1])
}
archive, err := zipFiles(matchFiles) archive, err := zipFiles(matchFiles)
if err != nil { if err != nil {

4
internal/logging/logging.go
View File

@ -101,3 +101,7 @@ func getLogName(version, revision string) string {
func MatchLogName(name string) bool { func MatchLogName(name string) bool {
return regexp.MustCompile(`^v.*\.log$`).MatchString(name) return regexp.MustCompile(`^v.*\.log$`).MatchString(name)
} }
func MatchGUILogName(name string) bool {
return regexp.MustCompile(`^gui_v.*\.log$`).MatchString(name)
}