tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #4057 from matrix-org/rav/use_correct_python

Browse source 
Use the right python when starting workers
This commit is contained in:
Amber Brown 2018-10-19 09:09:08 +11:00 committed by GitHub
commit 6190abe8da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/4057.bugfix Normal file
View file

@ -0,0 +1 @@
synctl will use the right python executable to run worker processes

3
synctl
View file

@ -1,6 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2014-2016 OpenMarket Ltd # Copyright 2014-2016 OpenMarket Ltd
# Copyright 2018 New Vector Ltd
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with 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): def start_worker(app, configfile, worker_configfile):
args = [ args = [
"python", "-B", sys.executable, "-B",
"-m", app, "-m", app,
"-c", configfile, "-c", configfile,
"-c", worker_configfile "-c", worker_configfile