mirror of
https://github.com/outbackdingo/patroni.git
synced 2026-08-25 14:53:37 +00:00
Compatibility with pyinstaller (#2537)
it doesn't like relative imports and not recognise `http.server` imported with `six`. The last one is explicitly added to the list of `hiddenimports()` and will break compatibility with python 2.7, which support will be dropped in the next Patroni release anyway. Close https://github.com/zalando/patroni/issues/2535
This commit is contained in:
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
pip install --ignore-installed setuptools==19.2 pyinstaller
|
pip install --ignore-installed pyinstaller
|
||||||
pyinstaller --clean --onefile patroni.spec
|
pyinstaller --clean patroni.spec
|
||||||
|
|||||||
+1
-1
@@ -8,7 +8,7 @@ def hiddenimports():
|
|||||||
sys.path.insert(0, '.')
|
sys.path.insert(0, '.')
|
||||||
try:
|
try:
|
||||||
import patroni.dcs
|
import patroni.dcs
|
||||||
return patroni.dcs.dcs_modules()
|
return patroni.dcs.dcs_modules() + ['http.server']
|
||||||
finally:
|
finally:
|
||||||
sys.path.pop(0)
|
sys.path.pop(0)
|
||||||
|
|
||||||
|
|||||||
+9
-9
@@ -3,7 +3,7 @@ import os
|
|||||||
import signal
|
import signal
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from .daemon import AbstractPatroniDaemon, abstract_main
|
from patroni.daemon import AbstractPatroniDaemon, abstract_main
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -11,13 +11,13 @@ logger = logging.getLogger(__name__)
|
|||||||
class Patroni(AbstractPatroniDaemon):
|
class Patroni(AbstractPatroniDaemon):
|
||||||
|
|
||||||
def __init__(self, config):
|
def __init__(self, config):
|
||||||
from .api import RestApiServer
|
from patroni.api import RestApiServer
|
||||||
from .dcs import get_dcs
|
from patroni.dcs import get_dcs
|
||||||
from .ha import Ha
|
from patroni.ha import Ha
|
||||||
from .postgresql import Postgresql
|
from patroni.postgresql import Postgresql
|
||||||
from .request import PatroniRequest
|
from patroni.request import PatroniRequest
|
||||||
from .version import __version__
|
from patroni.version import __version__
|
||||||
from .watchdog import Watchdog
|
from patroni.watchdog import Watchdog
|
||||||
|
|
||||||
super(Patroni, self).__init__(config)
|
super(Patroni, self).__init__(config)
|
||||||
|
|
||||||
@@ -138,7 +138,7 @@ def patroni_main():
|
|||||||
|
|
||||||
def main():
|
def main():
|
||||||
if os.getpid() != 1:
|
if os.getpid() != 1:
|
||||||
from . import check_psycopg
|
from patroni import check_psycopg
|
||||||
|
|
||||||
check_psycopg()
|
check_psycopg()
|
||||||
return patroni_main()
|
return patroni_main()
|
||||||
|
|||||||
Reference in New Issue
Block a user