diff options
| author | reivilibre <38398653+reivilibre@users.noreply.github.com> | 2021-07-08 14:27:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-08 14:27:12 +0100 |
| commit | aa7806486960f501d72917f1a90a36cdc8035a05 (patch) | |
| tree | 1b1c33d3037560fbd5d37d5852543f1d33327e9e | |
| parent | Rebuild event auth when rebuilding an event after a call to a `ThirdPartyEven... (diff) | |
| download | synapse-aa7806486960f501d72917f1a90a36cdc8035a05.tar.xz | |
Minor changes to `user_daily_visits` (#10324)
* Use fake time in tests in _get_start_of_day. * Change the inequality of last_seen in user_daily_visits Co-authored-by: Erik Johnston <erik@matrix.org>
| -rw-r--r-- | changelog.d/10324.misc | 1 | ||||
| -rw-r--r-- | synapse/storage/databases/main/metrics.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/10324.misc b/changelog.d/10324.misc new file mode 100644 index 0000000000..3c3ee6d6fc --- /dev/null +++ b/changelog.d/10324.misc @@ -0,0 +1 @@ +Minor change to the code that populates `user_daily_visits`. diff --git a/synapse/storage/databases/main/metrics.py b/synapse/storage/databases/main/metrics.py index c3f551d377..e3a544d9b2 100644 --- a/synapse/storage/databases/main/metrics.py +++ b/synapse/storage/databases/main/metrics.py @@ -320,7 +320,7 @@ class ServerMetricsStore(EventPushActionsWorkerStore, SQLBaseStore): """ Returns millisecond unixtime for start of UTC day. """ - now = time.gmtime() + now = time.gmtime(self._clock.time()) today_start = calendar.timegm((now.tm_year, now.tm_mon, now.tm_mday, 0, 0, 0)) return today_start * 1000 @@ -352,7 +352,7 @@ class ServerMetricsStore(EventPushActionsWorkerStore, SQLBaseStore): ) udv ON u.user_id = udv.user_id AND u.device_id=udv.device_id INNER JOIN users ON users.name=u.user_id - WHERE last_seen > ? AND last_seen <= ? + WHERE ? <= last_seen AND last_seen < ? AND udv.timestamp IS NULL AND users.is_guest=0 AND users.appservice_id IS NULL GROUP BY u.user_id, u.device_id |