diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-10-19 09:09:08 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-19 09:09:08 +1100 |
| commit | 6190abe8da33f4aab94aea26cea1490825a6b64f (patch) | |
| tree | 96a22b2002e0b5765fb095a7790ad0ad8dda46fb | |
| parent | Merge branch 'master' into develop (diff) | |
| parent | Use the right python when starting workers (diff) | |
| download | synapse-6190abe8da33f4aab94aea26cea1490825a6b64f.tar.xz | |
Merge pull request #4057 from matrix-org/rav/use_correct_python
Use the right python when starting workers
| -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 |