From c69026a7586fe51a5def39cf0a581869b1228419 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 18 Oct 2018 21:04:34 +0100
Subject: [PATCH] Use the right python when starting workers
We should use the same python to start the workers as we do for the main
synapse (ie, the same one used to run synctl.)
---
changelog.d/4057.bugfix | 1 +
synctl | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
create mode 100644 changelog.d/4057.bugfix
diff --git a/changelog.d/4057.bugfix b/changelog.d/4057.bugfix
new file mode 100644
index 0000000000..7577731255
--- /dev/null
+++ b/changelog.d/4057.bugfix
@@ -0,0 +1 @@
+synctl will use the right python executable to run worker processes
\ No newline at end of file
diff --git a/synctl b/synctl
index 4bd4c68b37..bb8cb084cc 100755
--- a/synctl
+++ b/synctl
@@ -1,6 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright 2014-2016 OpenMarket Ltd
+# Copyright 2018 New Vector Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -86,7 +87,7 @@ def start(configfile):
def start_worker(app, configfile, worker_configfile):
args = [
- "python", "-B",
+ sys.executable, "-B",
"-m", app,
"-c", configfile,
"-c", worker_configfile
--
GitLab