paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-24 00:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

analytics: Don't import zilencer-specific code unconditionally.

Browse Source 
This fixes the production server not working when zilencer is not
enabled.
This commit is contained in:
Tim Abbott
2023-12-05 10:35:39 -08:00
parent 14b1539647
commit 28d736d63b
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
analytics/urls.py
View File

@@ -1,5 +1,6 @@
from typing import List, Union from typing import List, Union
from django.conf import settings
from django.conf.urls import include from django.conf.urls import include
from django.urls import path from django.urls import path
from django.urls.resolvers import URLPattern, URLResolver from django.urls.resolvers import URLPattern, URLResolver
@@ -9,13 +10,10 @@ from analytics.views.installation_activity import (
get_integrations_activity, get_integrations_activity,
) )
from analytics.views.realm_activity import get_realm_activity from analytics.views.realm_activity import get_realm_activity
from analytics.views.remote_activity import get_remote_server_activity
from analytics.views.stats import ( from analytics.views.stats import (
get_chart_data, get_chart_data,
get_chart_data_for_installation, get_chart_data_for_installation,
get_chart_data_for_realm, get_chart_data_for_realm,
get_chart_data_for_remote_installation,
get_chart_data_for_remote_realm,
get_chart_data_for_stream, get_chart_data_for_stream,
stats, stats,
stats_for_installation, stats_for_installation,
@@ -30,7 +28,6 @@ from zerver.lib.rest import rest_path
i18n_urlpatterns: List[Union[URLPattern, URLResolver]] = [ i18n_urlpatterns: List[Union[URLPattern, URLResolver]] = [
# Server admin (user_profile.is_staff) visible stats pages # Server admin (user_profile.is_staff) visible stats pages
path("activity", get_installation_activity), path("activity", get_installation_activity),
path("activity/remote", get_remote_server_activity),
path("activity/integrations", get_integrations_activity), path("activity/integrations", get_integrations_activity),
path("activity/support", support, name="support"), path("activity/support", support, name="support"),
path("activity/remote/support", remote_servers_support, name="remote_servers_support"), path("activity/remote/support", remote_servers_support, name="remote_servers_support"),
@@ -38,14 +35,26 @@ i18n_urlpatterns: List[Union[URLPattern, URLResolver]] = [
path("user_activity/<user_profile_id>/", get_user_activity), path("user_activity/<user_profile_id>/", get_user_activity),
path("stats/realm/<realm_str>/", stats_for_realm), path("stats/realm/<realm_str>/", stats_for_realm),
path("stats/installation", stats_for_installation), path("stats/installation", stats_for_installation),
path("stats/remote/<int:remote_server_id>/installation", stats_for_remote_installation),
path(
"stats/remote/<int:remote_server_id>/realm/<int:remote_realm_id>/", stats_for_remote_realm
),
# User-visible stats page # User-visible stats page
path("stats", stats, name="stats"), path("stats", stats, name="stats"),
] ]
if settings.ZILENCER_ENABLED:
from analytics.views.remote_activity import get_remote_server_activity
from analytics.views.stats import (
get_chart_data_for_remote_installation,
get_chart_data_for_remote_realm,
)
i18n_urlpatterns += [
path("activity/remote", get_remote_server_activity),
path("stats/remote/<int:remote_server_id>/installation", stats_for_remote_installation),
path(
"stats/remote/<int:remote_server_id>/realm/<int:remote_realm_id>/",
stats_for_remote_realm,
),
]
# These endpoints are a part of the API (V1), which uses: # These endpoints are a part of the API (V1), which uses:
# * REST verbs # * REST verbs
# * Basic auth (username:password is email:apiKey) # * Basic auth (username:password is email:apiKey)