Skip to content

Commit ee22a4b

Browse files
committed
Remove duplication log entries
1 parent d172eea commit ee22a4b

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

cmd/reminder/main.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ func Run() error {
7070
func RepeatInteractiveSession(reminderData *model.ReminderData) error {
7171
var err error
7272
// print data stats
73-
fmt.Println(reminderData.Stats())
73+
stats, err := reminderData.Stats()
74+
fmt.Println(stats)
75+
utils.LogError(err)
7476
// try automatic backup
7577
_, err = reminderData.AutoBackup(24 * 60 * 60)
7678
utils.LogError(err)

internal/model/reminder_data.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ func (rd *ReminderData) SyncCalendar(calOptions *calendar.Options) error {
4545
logger.Info("Retrieve the Cloud Calendar Service.")
4646
srv, err := calendar.GetCalendarService(calOptions)
4747
if err != nil {
48-
logger.Error(fmt.Sprintf("Unable to retrieve Calendar client: %v", err))
49-
return err
48+
return fmt.Errorf("Unable to retrieve Calendar client: %w", err)
5049
}
5150

5251
logger.Info("Fetch the list of all upcoming Calendar Events with each type of recurring event as single unit.")
@@ -63,8 +62,7 @@ func (rd *ReminderData) SyncCalendar(calOptions *calendar.Options) error {
6362
MaxResults(250). // 250 is default and is maximum value; if there are more than 250 events, then we'll have to paginate
6463
Do()
6564
if err != nil {
66-
logger.Error(fmt.Sprintf("Unable to retrieve the events: %v", err))
67-
return err
65+
return fmt.Errorf("Unable to retrieve the events: %w", err)
6866
}
6967

7068
// Get Cloud Calendar details
@@ -104,8 +102,7 @@ func (rd *ReminderData) SyncCalendar(calOptions *calendar.Options) error {
104102
Q(calendar.TitlePrefix).
105103
Do()
106104
if err != nil {
107-
logger.Error(fmt.Sprintf("Unable to retrieve the events: %v", err))
108-
return err
105+
return fmt.Errorf("Unable to retrieve the events: %v", err)
109106
}
110107
fmt.Printf("Listing matching events (%v) and deleting the ones registered by reminder app:\n", len(reminderEvents.Items))
111108
if len(reminderEvents.Items) == 0 {
@@ -125,8 +122,7 @@ func (rd *ReminderData) SyncCalendar(calOptions *calendar.Options) error {
125122
continue
126123
}
127124
if err := srv.Events.Delete("primary", item.Id).Do(); err != nil {
128-
logger.Error(fmt.Sprintf("Couldn't delete the Calendar event %q | %q | %v", item.Id, item.Summary, err))
129-
return err
125+
return fmt.Errorf("Couldn't delete the Calendar event %q | %q | %v", item.Id, item.Summary, err)
130126
} else {
131127
deletionCount += 1
132128
fmt.Printf(" - Deleted the Calendar event %q | %q\n", item.Id, calendar.EventString(item))
@@ -156,7 +152,8 @@ func (rd *ReminderData) SyncCalendar(calOptions *calendar.Options) error {
156152
}
157153
_, err = srv.Events.Insert("primary", event).Do()
158154
if err != nil {
159-
logger.Error(err)
155+
// just ignore, but log the error
156+
utils.LogError(err)
160157
}
161158
logger.Info(fmt.Sprintf("Synced the event %q.\n", calendar.EventString(event)))
162159
}
@@ -877,7 +874,7 @@ func (rd *ReminderData) PrintNotesAndAskOptions(notes Notes, display_mode string
877874
fmt.Printf("Note: Using passed notes; the list will not be refreshed immediately!\n")
878875
fmt.Printf("Note: You must not run multiple instances of the app on same data file!\n")
879876
default:
880-
logger.Error("Error: Unreachable code")
877+
return errors.New("Error: Unreachable code")
881878
}
882879

883880
// sort notes

pkg/calendar/calendar.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func EventsDetails(events *gc.Events) (string, error) {
2727
value, err := utils.StrToTime(events.Updated, events.TimeZone)
2828
if err != nil {
2929
logger.Error(err)
30-
return "unparsable"
30+
return ""
3131
}
3232
return value.String()
3333
}

0 commit comments

Comments
 (0)