nemunaire/reveil
1
0
Fork 0
Code Issues 1 Pull requests 3 Releases 27 Activity

Use system or default TZ env var
All checks were successful
continuous-integration/drone/tag Build is passing
Details

Browse source
This commit is contained in:
nemunaire 2022-12-23 22:32:11 +01:00
commit 2c146f5615
5 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
model/alarm.go
View file

@ -174,7 +174,7 @@ func (a *AlarmRepeated) FillExcepts(cfg *config.Config, db *LevelDBStorage) erro
end := time.Time(*exception.End).AddDate(0, 0, 1)
for t := time.Time(*exception.Start); end.After(t); t = t.AddDate(0, 0, 1) {
if t.Weekday() == a.Weekday {
a.Excepts = append(a.Excepts, time.Date(t.Year(), t.Month(), t.Day(), time.Time(*a.StartTime).Hour(), time.Time(*a.StartTime).Minute(), time.Time(*a.StartTime).Second(), 0, cfg.Timezone.GetLocation()))
a.Excepts = append(a.Excepts, time.Date(t.Year(), t.Month(), t.Day(), time.Time(*a.StartTime).Hour(), time.Time(*a.StartTime).Minute(), time.Time(*a.StartTime).Second(), 0, time.Local))
t = t.AddDate(0, 0, 6)
}
}
@ -196,7 +196,7 @@ func (a *AlarmRepeated) GetNextOccurence(cfg *config.Config, db *LevelDBStorage)
now := time.Now()
today := time.Date(now.Year(), now.Month(), now.Day(), time.Time(*a.StartTime).Hour(), time.Time(*a.StartTime).Minute(), time.Time(*a.StartTime).Second(), 0, cfg.Timezone.GetLocation())
today := time.Date(now.Year(), now.Month(), now.Day(), time.Time(*a.StartTime).Hour(), time.Time(*a.StartTime).Minute(), time.Time(*a.StartTime).Second(), 0, time.Local)
if now.After(today) {
today = today.AddDate(0, 0, 1)
}