From 3927aa8abbd8a3c7b8311ee4ae1833ffc5437caf Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Fri, 25 Aug 2023 15:25:03 +0100
Subject: [PATCH] More processor log fixes

---
 pkg/common/db/file.go      |  1 +
 pkg/processor/processor.go | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkg/common/db/file.go b/pkg/common/db/file.go
index 665b105..67b8a7d 100644
--- a/pkg/common/db/file.go
+++ b/pkg/common/db/file.go
@@ -21,6 +21,7 @@ type Report struct {
 	Commented  bool      `gorm:"default:false"`
 	Subscriber string
 	Name       string
+	FileName   string
 	FileID     uint
 	FilePath   string
 	CaseID     string
diff --git a/pkg/processor/processor.go b/pkg/processor/processor.go
index 081788f..9b98fb4 100644
--- a/pkg/processor/processor.go
+++ b/pkg/processor/processor.go
@@ -44,7 +44,7 @@ func (s *BaseSubscriber) Setup(c *pubsub.Client) {
 }
 
 type ReportToExecute struct {
-	Name, BaseDir, Subscriber string
+	Name, BaseDir, Subscriber, FileName string
 	File                      *db.File
 	Scripts                   map[string]string
 	Timeout                   time.Duration
@@ -85,7 +85,7 @@ func RunReport(report *ReportToExecute) (map[string][]byte, error) {
 	var output = make(map[string][]byte)
 
 	for scriptName, script := range report.Scripts {
-		log.Debugf("Running script '%s' on sosreport '%s'", scriptName, report.Name)
+		log.Debugf("Running script '%s' on sosreport '%s'", scriptName, report.FileName)
 		var ret []byte
 		var err error
 		if report.Timeout > 0 {
@@ -142,6 +142,7 @@ func (runner *ReportRunner) UploadAndSaveReport(report *ReportToExecute, caseNum
 	newReport.Created = time.Now()
 	newReport.CaseID = sfCase.Id
 	newReport.FilePath = file.Path
+	newReport.FileName = filepath.Base(file.Path)
 	newReport.Name = report.Name
 	newReport.FileID = file.ID
 	newReport.Subscriber = report.Subscriber
@@ -149,7 +150,7 @@ func (runner *ReportRunner) UploadAndSaveReport(report *ReportToExecute, caseNum
 	if runner.Config.Processor.ReportsUploadPath == "" {
 		uploadPath = filePath
 	} else {
-		uploadPath = path.Join(runner.Config.Processor.ReportsUploadPath, filepath.Base(filePath))
+		uploadPath = path.Join(runner.Config.Processor.ReportsUploadPath, newReport.FileName)
 	}
 
 	log.Debugf("Uploading script output to files.com")
@@ -189,7 +190,7 @@ func (runner *ReportRunner) Run(reportFn func(report *ReportToExecute) (map[stri
 
 		caseNumber, err := common.GetCaseNumberFromFilename(report.File.Path)
 		if err != nil {
-			log.Error(err)
+			log.Info(err)
 			continue
 		}
 
@@ -200,7 +201,7 @@ func (runner *ReportRunner) Run(reportFn func(report *ReportToExecute) (map[stri
 			continue
 		}
 
-		log.Debugf("Uploading and saving results of running '%s' on '%s' (count=%d)", report.Name, report.File.Path, len(scriptOutputs))
+		log.Debugf("Uploading and saving results of running '%s' on '%s' (count=%d)", report.Name, report.FileName, len(scriptOutputs))
 		if err := runner.UploadAndSaveReport(&report, caseNumber, scriptOutputs); err != nil {
 			log.Errorf("Failed to upload and save output of '%s': %s", report.Name, err)
 			continue
@@ -412,7 +413,7 @@ func (p *Processor) BatchSalesforceComments(ctx *context.Context, interval time.
 	}
 
 	if len(reports) <= 0 {
-		log.Warnf("No reports found to be processed - skipping")
+		log.Info("No reports found to be processed - skipping")
 		return
 	}
 
@@ -466,7 +467,7 @@ func (p *Processor) BatchSalesforceComments(ctx *context.Context, interval time.
 					continue
 				}
 
-				log.Infof("Successfully posted comment on case %s for  %d reports", caseId, len(reports))
+				log.Infof("Successfully posted comment on case %s for %d reports", caseId, len(reports))
 				for _, report := range reports {
 					report.Commented = true
 					p.Db.Save(report)