diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-10-18 21:04:34 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-10-18 21:06:30 +0100 |
| commit | c69026a7586fe51a5def39cf0a581869b1228419 (patch) | |
| tree | 96a22b2002e0b5765fb095a7790ad0ad8dda46fb | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-c69026a7586fe51a5def39cf0a581869b1228419.tar.xz | |
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.)
| -rw-r--r-- | changelog.d/4057.bugfix | 1 | ||||
| -rwxr-xr-x | synctl | 3 |
2 files changed, 3 insertions, 1 deletions
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 |