From 5929602c1569192fa37900b9d4b3aff9dad2d081 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Apr 2022 12:55:03 +0000 Subject: [PATCH 1/2] Bump async from 2.6.3 to 2.6.4 in /platypush/backend/http/webapp Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] --- platypush/backend/http/webapp/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/platypush/backend/http/webapp/package-lock.json b/platypush/backend/http/webapp/package-lock.json index ef3e46df3..c27e627e6 100644 --- a/platypush/backend/http/webapp/package-lock.json +++ b/platypush/backend/http/webapp/package-lock.json @@ -3257,9 +3257,9 @@ } }, "node_modules/async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "dev": true, "dependencies": { "lodash": "^4.17.14" @@ -14168,9 +14168,9 @@ "dev": true }, "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "dev": true, "requires": { "lodash": "^4.17.14" From 55958c1b573a083db8cb2ee851ca264679ff2f75 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Thu, 28 Apr 2022 23:29:45 +0200 Subject: [PATCH 2/2] [#217] Casting `get_next` to `datetime` to prevent DST issues --- platypush/cron/scheduler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platypush/cron/scheduler.py b/platypush/cron/scheduler.py index 0671cfd0d..86fbff62a 100644 --- a/platypush/cron/scheduler.py +++ b/platypush/cron/scheduler.py @@ -90,8 +90,8 @@ class Cronjob(threading.Thread): now = get_now() self._event_type = CronjobEvent.NONE cron = croniter.croniter(self.cron_expression, now) - next_run = cron.get_next() - self._event.wait(max(0, next_run - now.timestamp())) + next_run = cron.get_next(datetime.datetime) + self._event.wait(max(0, (next_run - now).total_seconds())) def stop(self): self._event_type = CronjobEvent.STOP