Merge branch 'main' into avm99963-monorail
Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e
GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/settings.py b/settings.py
index f8fa130..0759364 100644
--- a/settings.py
+++ b/settings.py
@@ -191,11 +191,6 @@
# sometimes useful to run a tainted version on staging that has a separate
# memcache namespace. E.g., os.environ.get('CURRENT_VERSION_ID')
memcache_namespace = None # Should be None when committed.
-redis_namespace = None
-
-# Default Redis host and port
-redis_host = 'localhost'
-redis_port = '6379'
# Recompute derived issue fields via work items rather than while
# the user is waiting for a page to load.
@@ -306,30 +301,14 @@
analytics_id = ''
branded_domains = branded_domains_prod
domain_to_default_project = domain_to_default_project_prod
- # For each of these redis_hosts, they must match the corresponding
- # HOST address of the redis instance for the environment. You can use
- # the following command to find it.
- # ```
- # gcloud redis instances list --project monorail-staging \
- # --region us-central1
- # ````
- # Leaving empty for now
- redis_host = ''
+
elif app_id == 'monorail-staging':
site_name = 'Monorail Staging'
banner_message = 'This staging site does not send emails.'
# The Google Cloud SQL databases to use.
db_cloud_project = app_id
- branded_domains = branded_domains
- domain_to_default_project = domain_to_default_project
- # For each of these redis_hosts, they must match the corresponding
- # HOST address of the redis instance for the environment. You can use
- # the following command to find it.
- # ```
- # gcloud redis instances list --project monorail-staging \
- # --region us-central1
- # ````
- redis_host = '10.228.109.51'
+ branded_domains = branded_domains_staging
+ domain_to_default_project = domain_to_default_project_staging
elif app_id == 'monorail-dev':
site_name = 'Monorail Dev'
@@ -338,15 +317,12 @@
db_cloud_project = app_id
branded_domains = branded_domains
domain_to_default_project = domain_to_default_project
- # See comment above on how to find this address.
- redis_host = '10.150.170.251'
# Use replicas created when testing the restore procedures on 2021-02-24
db_replica_prefix = 'replica-2'
if local_mode:
site_name = 'Monorail Local'
num_logical_shards = 10
- redis_host = 'localhost'
# Run cloud tasks emulator at port 9090
CLOUD_TASKS_EMULATOR_ADDRESS = '127.0.0.1:9090'
CLOUD_TASKS_REGION = 'us-central1'
@@ -439,12 +415,6 @@
# The name of the spam model in ML Engine.
spam_model_name = 'spam_only_words'
-# The name of the component model in ML Engine
-component_model_name = 'component_top_words'
-
-# The name of the gcs bucket containing component predicition trainer code.
-component_ml_bucket = classifier_project_id + '-mlengine'
-
ratelimiting_enabled = True
# Requests that hit ratelimiting_cost_thresh_sec get one extra count