diff --git a/salt/hg/config/hg.apache.conf.jinja b/salt/hg/config/hg.apache.conf.jinja index 06abd5ec..04a60c3d 100644 --- a/salt/hg/config/hg.apache.conf.jinja +++ b/salt/hg/config/hg.apache.conf.jinja @@ -46,7 +46,7 @@ # A lightweight standin for revision app to maintain support for /lookup WSGIDaemonProcess hgrev user=hg group=hg \ - threads=2 processes=4 maximum-requests=1000 \ + threads=1 processes=6 maximum-requests=100 \ display-name=hgrev # The Location hack ensures the lookup app is run within # this process group diff --git a/salt/hg/files/hg/src/hgrev.py b/salt/hg/files/hg/src/hgrev.py index b00e97ba..a2ca8335 100644 --- a/salt/hg/files/hg/src/hgrev.py +++ b/salt/hg/files/hg/src/hgrev.py @@ -17,7 +17,7 @@ def __init__(self, verbose=False): def successful_response(self, response, contents): headers = [("Content-Type", "text/plain")] response("200 OK", headers) - return [contents.encode()] + return [contents] def failed_response(self, response, detail=""): headers = [("Content-Type", "text/plain")] @@ -46,7 +46,7 @@ def __call__(self, env, response): command, cwd=hg_repo, capture_output=True, - text=True, + text=False, shell=False, check=True )