summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2021-05-13 10:55:57 +0100
committerWill Hunt <will@half-shot.uk>2021-05-13 10:55:57 +0100
commit7ea2cd1ce972d3b48007471a4820de2b00ba2743 (patch)
treecc3eb5af7ea437413d3a26edc961e1a9d3a3a28c
parentIncorporate changes from review (diff)
downloadsynapse-github/hs/use-malloc-in-docker.tar.xz
Set PYTHONMALLOC to malloc in start.py github/hs/use-malloc-in-docker hs/use-malloc-in-docker
-rw-r--r--changelog.d/xxxx.misc1
-rwxr-xr-xdocker/start.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/xxxx.misc b/changelog.d/xxxx.misc
new file mode 100644
index 0000000000..5f9dcc94bd
--- /dev/null
+++ b/changelog.d/xxxx.misc
@@ -0,0 +1 @@
+Ensure python uses `malloc` when running Synapse in Docker.
\ No newline at end of file
diff --git a/docker/start.py b/docker/start.py
index 16d6a8208a..55faca600d 100755
--- a/docker/start.py
+++ b/docker/start.py
@@ -218,6 +218,7 @@ def main(args, environ):
 
     if os.path.isfile(jemallocpath):
         environ["LD_PRELOAD"] = jemallocpath
+        environ["PYTHONMALLOC"] = "malloc"
     else:
         log("Could not find %s, will not use" % (jemallocpath,))