From 6e5cd82dfb9cc31c9c1a2c8ad31fc5395876fd7c Mon Sep 17 00:00:00 2001 From: Eric Solari Date: Tue, 15 Mar 2016 22:24:08 -0500 Subject: [PATCH] Add CherryPy Environment Option --- PlexPy.py | 1 + plexpy/config.py | 1 + plexpy/webstart.py | 1 + 3 files changed, 3 insertions(+) diff --git a/PlexPy.py b/PlexPy.py index 15e3212e..4062c948 100755 --- a/PlexPy.py +++ b/PlexPy.py @@ -181,6 +181,7 @@ def main(): 'http_port': http_port, 'http_host': plexpy.CONFIG.HTTP_HOST, 'http_root': plexpy.CONFIG.HTTP_ROOT, + 'http_environment': plexpy.CONFIG.HTTP_ENVIRONMENT, 'http_proxy': plexpy.CONFIG.HTTP_PROXY, 'enable_https': plexpy.CONFIG.ENABLE_HTTPS, 'https_cert': plexpy.CONFIG.HTTPS_CERT, diff --git a/plexpy/config.py b/plexpy/config.py index ccb05c6d..996a3c18 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -142,6 +142,7 @@ _CONFIG_DEFINITIONS = { 'HTTPS_KEY': (str, 'General', ''), 'HTTPS_DOMAIN': (str, 'General', 'localhost'), 'HTTPS_IP': (str, 'General', '127.0.0.1'), + 'HTTP_ENVIRONMENT': (str, 'General', 'production'), 'HTTP_HOST': (str, 'General', '0.0.0.0'), 'HTTP_PASSWORD': (str, 'General', ''), 'HTTP_PORT': (int, 'General', 8181), diff --git a/plexpy/webstart.py b/plexpy/webstart.py index b1eae170..36760dd5 100644 --- a/plexpy/webstart.py +++ b/plexpy/webstart.py @@ -46,6 +46,7 @@ def initialize(options): options_dict = { 'server.socket_port': options['http_port'], 'server.socket_host': options['http_host'], + 'environment': options['http_environment'], 'server.thread_pool': 10, 'tools.encode.on': True, 'tools.encode.encoding': 'utf-8',