Skip to content

Commit 064d864

Browse files
committed
python: fix the UTC time
It appears that once we start using UTC time for now(), Python will force us to have all time in time-zone aware values. If we use UTC everywhere it looks like we are off by few hours and fetch no patches. Drop the time zones. Signed-off-by: Jakub Kicinski <[email protected]>
1 parent a0cb4b9 commit 064d864

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

check_fetcher.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def main():
5151

5252
old_db, old_pstate = load_old_db(tgt_json)
5353

54-
now = datetime.datetime.now(datetime.UTC)
54+
now = datetime.datetime.now()
5555
since = now - datetime.timedelta(days=look_back_days)
5656

5757
json_resp = pw.get_patches_all(delegate=delegate, since=since)
@@ -107,7 +107,7 @@ def main():
107107
with open(tgt_json, "w") as fp:
108108
json.dump(new_db, fp)
109109

110-
now = datetime.datetime.now(datetime.UTC)
110+
now = datetime.datetime.now()
111111
with open(tgt_json + now.strftime("-%m-%Y"), "w") as fp:
112112
json.dump(new_db, fp)
113113

mailbot.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ def date(self):
454454
return datetime.datetime.fromisoformat(self.json['date'])
455455

456456
def age(self):
457-
return datetime.datetime.now(datetime.UTC) - self.date()
457+
return datetime.datetime.now() - self.date()
458458

459459
def __getitem__(self, item):
460460
return self.json[item]
@@ -666,7 +666,7 @@ def main():
666666

667667
global should_stop
668668
while not should_stop:
669-
req_time = datetime.datetime.now(datetime.UTC)
669+
req_time = datetime.datetime.now()
670670

671671
if (req_time - doc_load_time).total_seconds() > 24 * 60 * 60:
672672
global maintainers
@@ -690,7 +690,7 @@ def main():
690690
delay_actions = delay_actions[1:]
691691
do_mail_delayed(msg, pw, dr)
692692

693-
secs = 120 - (datetime.datetime.now(datetime.UTC) - req_time).total_seconds()
693+
secs = 120 - (datetime.datetime.now() - req_time).total_seconds()
694694
while secs > 0 and not should_stop:
695695
time.sleep(3)
696696
secs -= 3

pw_poller.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def __init__(self) -> None:
7171
self._pw = Patchwork(config)
7272

7373
self._state = {
74-
'last_poll': (datetime.datetime.now(datetime.UTC) - datetime.timedelta(hours=2)).timestamp(),
74+
'last_poll': (datetime.datetime.now() - datetime.timedelta(hours=2)).timestamp(),
7575
'done_series': [],
7676
}
7777
self.init_state_from_disk()
@@ -191,7 +191,7 @@ def run(self) -> None:
191191
partial_series = {}
192192

193193
prev_big_scan = datetime.datetime.fromtimestamp(self._state['last_poll'])
194-
prev_req_time = datetime.datetime.now(datetime.UTC)
194+
prev_req_time = datetime.datetime.now()
195195

196196
# We poll every 2 minutes, for series from last 10 minutes
197197
# Every 3 hours we do a larger check of series of last 12 hours to make sure we didn't miss anything
@@ -200,7 +200,7 @@ def run(self) -> None:
200200
try:
201201
while True:
202202
this_poll_seen = set()
203-
req_time = datetime.datetime.now(datetime.UTC)
203+
req_time = datetime.datetime.now()
204204

205205
# Decide if this is a normal 4 minute history poll or big scan of last 12 hours
206206
if prev_big_scan + datetime.timedelta(hours=self._recheck_period) < req_time:
@@ -249,7 +249,7 @@ def run(self) -> None:
249249
self.done_series.add(s['id'])
250250
log(f"Testing complete for series {s['id']}", "")
251251

252-
secs = 120 - (datetime.datetime.now(datetime.UTC) - req_time).total_seconds()
252+
secs = 120 - (datetime.datetime.now() - req_time).total_seconds()
253253
if secs > 0:
254254
log("Sleep", secs)
255255
time.sleep(secs)

0 commit comments

Comments
 (0)