Skip to content

Commit 58bff89

Browse files
committed
Try null URL
1 parent 617d436 commit 58bff89

File tree

5 files changed

+15
-1
lines changed

5 files changed

+15
-1
lines changed

dev/environment

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,6 @@ HELPDESK_BACKEND="warehouse.helpdesk.services.ConsoleHelpDeskService"
9191

9292
# HELPDESK_NOTIFICATION_SERVICE_URL="https://..."
9393
HELPDESK_NOTIFICATION_BACKEND="warehouse.helpdesk.services.ConsoleAdminNotificationService"
94+
95+
# XML-RPC Cache Service
96+
XMLRPC_CACHE_URL="null://"

tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ def get_app_config(database, nondefaults=None):
331331
"sessions.secret": "123456",
332332
"sessions.url": "redis://localhost:0/",
333333
"statuspage.url": "https://2p66nmmycsj3.statuspage.io",
334-
"warehouse.xmlrpc.cache.url": "redis://localhost:0/",
334+
"warehouse.xmlrpc.cache.url": "null://",
335335
"terms.revision": "initial",
336336
}
337337

warehouse/config.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,16 @@ def template_view(config, name, route, template, route_kw=None, view_kw=None):
230230

231231

232232
def maybe_set(settings, name, envvar, coercer=None, default=None):
233+
print(name, envvar)
233234
if envvar in os.environ:
234235
value = os.environ[envvar]
236+
print("\t", name, envvar, value)
235237
if coercer is not None:
236238
value = coercer(value)
237239
settings.setdefault(name, value)
238240
elif default is not None:
239241
settings.setdefault(name, default)
242+
print("\t", name, envvar, "NOT SET")
240243

241244

242245
def maybe_set_compound(settings, base, name, envvar):
@@ -405,6 +408,7 @@ def configure(settings=None):
405408
maybe_set(settings, "token.two_factor.secret", "TOKEN_TWO_FACTOR_SECRET")
406409
maybe_set(settings, "token.remember_device.secret", "TOKEN_REMEMBER_DEVICE_SECRET")
407410
maybe_set_redis(settings, "warehouse.xmlrpc.cache.url", "REDIS_URL", db=4)
411+
maybe_set(settings, "warehouse.xmlrpc.cache.url", "XMLRPC_CACHE_URL")
408412
maybe_set(
409413
settings,
410414
"warehouse.xmlrpc.client.ratelimit_string",

warehouse/legacy/api/xmlrpc/cache/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ def store_purge_keys(config, session, flush_context):
6060

6161
@db.listens_for(db.Session, "after_commit")
6262
def execute_purge(config, session):
63+
Exception(config)
6364
purges = session.info.pop("warehouse.legacy.api.xmlrpc.cache.purges", set())
6465

6566
try:
@@ -96,9 +97,11 @@ def includeme(config):
9697

9798
xmlrpc_cache_url_scheme = parse_url(xmlrpc_cache_url).scheme
9899
if xmlrpc_cache_url_scheme in ("redis", "rediss"):
100+
print("*" * 80, "REDIS")
99101
xmlrpc_cache_class = RedisXMLRPCCache
100102
elif xmlrpc_cache_url_scheme in ("null"):
101103
xmlrpc_cache_class = NullXMLRPCCache
104+
print("*" * 80, "NULL")
102105
else:
103106
raise ConfigurationError(
104107
f"Unknown XMLRPCCache scheme: {xmlrpc_cache_url_scheme}"

warehouse/legacy/api/xmlrpc/cache/services.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ def __init__(
4949

5050
@classmethod
5151
def create_service(cls, context, request):
52+
raise Exception("here")
5253
return cls(
5354
request.registry.settings.get("warehouse.xmlrpc.cache.url"),
5455
request.task(purge_tag).delay,
@@ -61,12 +62,15 @@ def create_service(cls, context, request):
6162
)
6263

6364
def fetch(self, func, args, kwargs, key, tag, expires):
65+
raise Exception("here")
6466
return self.redis_lru.fetch(func, args, kwargs, key, tag, expires)
6567

6668
def purge(self, tag):
69+
raise Exception("here")
6770
return self.redis_lru.purge(tag)
6871

6972
def purge_tags(self, tags):
73+
raise Exception("here")
7074
for tag in tags:
7175
self._purger(tag)
7276

0 commit comments

Comments
 (0)