fix HealthCheck log filtering

AllenAnthes · AllenAnthes · commit ebb8285f95de · 2018-11-01T20:27:12.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -11,25 +11,18 @@ env:
   - secure: iJv9zwNPA6EeLgTUhiaTq3YnoSPILqz5Oerl1XoAbL6F5kcXrtY1/mw8BnqdgM7QIr7Q6fi75L1Ts2jBsi0IU/4FtlhRKuaMqlmCBd8z52Mb+KEGP3YJhfPceq5raVqIjc5nHikd2CsGdtSr6gFfNaRITvHqwaUs8owF5eMQX6irxnnWVmz47mKwxZ251vGQGyEukAYQRcIwzjr2dnA94E+tj2pTaCXJO4sBc9BqeDO+rYQCWc1yivhHxx0Zr/JuR/jceNjNL2rZa41GmHMlHenFcnseH84OQ/+/c7AmPLHcYmiTJIL1yY+sMS/PRhLOGzQnxIQvaA1LD8gEAY+YLn3Q6AgHveV28udfU7jzKQmgRqS4OeM1OhykknBcAdLo8k2gbVx73pO32Lgse0JL2S2jmr/yWBpYGoXJ/LeB4x+YG5mookGktRbwtb/RyPI/+W4DE8mgD/d5b0u6zXCwIQ1Xe78Lr4k+uo3mWMnjcvix2gLkPDwlW4zZ8UGe7M9XCkKuZnhxGUV3ijBuecIMBfABi1wGstXQzHLNtiul0ZPWUAeQxDoN+lr94aw+R0U9DcTHWtM2QXY77+olV7D9pnbPZKXB2QRfOpvS2jDQo4nXGCVV/UmCrYgC9sDQQD5u8QXqgJRHTb7Rl+9AKwl1C5u60sBRRpaneQlRBLOjWlo=
   - secure: MZlr2GanK4Je41ncRFHwJm8SyJ1yjPI3gKFdXb5xoVMdsKBnYbouz+5PG73Ri9oDnOYsY6c9lv6HrSSo6fO0fc/lyhZeKu34F288rAYPGJdg/Qn0c0xYsKug2qPAn+Oyl0BWjnfR5nSP7cdhRVwca84kVVfOWer6DP+bZZ2tJda5xKqyRFgvZRWZnrUegY/ciXtwjLswnwOX9VE9x0un29acsZvWDCRoGFM0P6SeM/aVYp+o5iJyw6mD8wtmLcw4kI6q3r6S2MbGJ+fefiUW70Of3oUD721aW2DYVkMd5pRgW3/VvW5km+UNo8zD9pffZLGev68hdyEA0Rhrw/qX5DinoS46HnSVlyJWdDUselYELumHAKdIjuWYMaW0sboN89mfNX0H1KaXT2Gc1+eO6nlmJLKwK2KQYULgQXkKoOOhCvvvw+uhMaqxjMp+oLcvwHt6s96KjlRGn7dNDnDePpWH7Pht0L1cYg9xnaeTKJfQm2N6cOQtLKHO/rBHYiEItG6O/kaQytokrU1tLo6Y5o3+8dybvulFha3xgq39oI0Mtp5fVbMM3wZOLQ5UqedYATMaoy4LamEiP0cvThlP5X5/TvyFcQxBu39EYWmaBcSPooncQVPoGyLzVAcfBQp3hOe0XbYKoY0VjHVWYbO2ghVXVax8CDJZ2feE5ghsdMQ=
 
-sudo: required
-
 os: linux
-
+sudo: required
 language: python
-
-python: 3.6
-
+dist: xenial
+python: 3.7
 cache: pip
-
 install:
 - pip install pipenv
 - pipenv install --system --deploy --dev
-
 script:
 - pytest
-
 services:
 - docker
-
 after_success:
 - bash bin/run.sh
diff --git a/Pipfile b/Pipfile
@@ -19,6 +19,8 @@ psycopg2 = "*"
 requests = "*"
 slack-sansio = "*"
 "slack-sansio[requests]" = "*"
+pyyaml = "*"
+websocket = "*"
 
 [dev-packages]
 pytest = "*"
@@ -27,3 +29,6 @@ django-debug-toolbar = "*"
 
 [requires]
 python_version = "3.7"
+
+[pipenv]
+allow_prereleases = true
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -1,3 +1,93 @@
+<div align="center">
+  <br />
+  <a href="https://operationcode.org">
+    <img
+      alt="Operation Code logo"
+      src="https://s3.amazonaws.com/operationcode-assets/branding/logos/large-blue-logo.png"
+      width="75%"
+    >
+  </a>
+  <br />
+  <br />
+</div>
+
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
+[![Twitter Follow](https://img.shields.io/twitter/follow/operation_code.svg?style=social&label=Follow&style=social)](https://twitter.com/operation_code)
+[![GitHub contributors](https://img.shields.io/github/contributors/cdnjs/cdnjs.svg)](https://github.com/OperationCode/operationcode_backend)
+
+
+[![Build Status](https://travis-ci.org/OperationCode/operationcode-pyback.svg?branch=master)](https://travis-ci.org/OperationCode/operationcode-pyback)
+[![View performance data on Skylight](https://badges.skylight.io/status/0iQU6bEW8ha1.svg)](https://oss.skylight.io/app/applications/0iQU6bEW8ha1)
+[![Good First Issue](https://img.shields.io/github/issues/OperationCode/front-end/good%20first%20issue.svg)](https://github.com/OperationCode/operationcode_backend/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
+
+# Welcome!
+
+This is the back-end application for [OperationCode](https://operationcode.org). We highly recommend [joining our organization](https://operationcode.org/join) to receive an invite to our Slack team. From there, you'll want to join the `#oc-projects` and `#oc-ruby-projects` channels. You can get help from multiple professional developers.
+
+Before contributing, please review our [Contributing Guide](CONTRIBUTING.md)
+
+## Maintainers
+
+For information about the maintainers of the project, check out [MAINTAINERS.md](MAINTAINERS.md).
+
+## Quick Start
+If you're unsure of how to start this app or code for it, don't worry! You're our target audience!
+Please read our [Contributing Guide](CONTRIBUTING.md) to learn everything you need to be able to ask the right questions on our Slack team.
+
+**In continuing with the quick start instructions, it is assumed that you are no stranger to Rails Applications, and standard GitHub workflows such as forking, cloning, and branching.**
+
+## Description
+If you'd like to learn more about what this project is what a Backend is you can read about this in our [Introduction Guide](INTRODUCTION.md).
+
+Recommended versions of tools used within the repo:
+
+* Ruby: See [.ruby-version](https://github.com/OperationCode/operationcode_backend/blob/master/.ruby-version)
+* `ruby@2.3.3`
+* `git@2.17.0` or greater
+
+
+<details>
+  <summary>Expand To View Quickstart</summary>
+<ol>
+<li> Install Dependencies (git, gnu make, docker) </li>
+
+  <ul>
+  <li> <a href="https://github.com/OperationCode/operationcode_backend/blob/master/docs/setup/docker_setup.md#git">git</a> </li>
+    <li> <a href="https://github.com/OperationCode/operationcode_backend/blob/master/docs/setup/docker_setup.md#make-for-windows-only">make</a> </li>
+    <li> <a href="https://github.com/OperationCode/operationcode_backend/blob/master/docs/setup/docker_setup.md#docker">docker</a> </li>
+  </ul>
+
+<li> <a href="https://github.com/OperationCode/operationcode_backend/blob/master/docs/setup/docker_setup.md#local-development-environment"> Retrieve Codebase</a> </li>
+
+<li> <a href="https://github.com/OperationCode/operationcode_backend/blob/master/docs/setup/docker_setup.md#database-setup"> Retrieve Codebase</a> </li>
+<li> <a href="https://github.com/OperationCode/operationcode_backend/blob/master/docs/setup/docker_setup.md#running-operationcode-backend"> Setup Codebase</a> </li>
+<li> <a href="https://github.com/OperationCode/operationcode_backend/blob/master/docs/setup/docker_setup.md#interact-with-backend"> Interact with Codebase</a> </li>
+
+</ol>
+
+</details >
+
+## Wiki
+
+We also have a [wiki](https://github.com/OperationCode/operationcode_backend/wiki) that contains common tutorials, tips, workflows and documentation around how to successfully contribute to, and work within, the operationcode_backend repository.
+
+## Postmortem Reports
+
+<details>
+
+<summary>Click to expand </summary>
+
+
+As incidents happen that require a great deal of troubleshooting and reveal a certain lack of domain knowledge, we wish to document these issues in way that can be used for contributors to learn. When such an event happens and a Root Cause Analysis is performed these issues will be added here.
+
+For the purpose of security we need to ensure that no data is added to AAR that would compromise any operation code asset. These reports are intended to document issues and reasoning for future contributors and assist future investigations. In these reports we keep the details blameless and focus on how we can improve and iterate in a better manner.
+
+<ol>
+<li> Slack User invites Stopped <a href="https://github.com/OperationCode/operationcode_backend/issues/388">link</a></li>
+</ol>
+</details>
+
+
 # [OperationCode-Pyback](https://github.com/OperationCode/operationcode-Pyback)
 
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -10,7 +10,7 @@ RUN mkdir /static
 COPY Pipfile* /src/
 
 RUN apt-get update \
-    && apt-get install -y libpq-dev gcc \
+    && apt-get install -y libpq-dev python3-websocket gcc \
     && rm -rf /var/lib/apt/lists/* \
     && pip install --upgrade pip \
     && pip install pipenv \
@@ -20,4 +20,6 @@ RUN apt-get update \
 COPY src /src
 
 EXPOSE 8000
-CMD python manage.py collectstatic --no-input;python manage.py makemigrations;python manage.py migrate;gunicorn pyback.wsgi -b 0.0.0.0:8000 -w 3 --access-logfile=- --error-logfile=- --capture-output
+CMD python manage.py collectstatic --no-input;python manage.py makemigrations;\
+    python manage.py migrate;\
+    gunicorn pyback.wsgi -b 0.0.0.0:8000 -w 3 --access-logfile=- --error-logfile=- --capture-output --logger-class "pyback.log.CustomGunicornLogger"
diff --git a/src/pyback/log.py b/src/pyback/log.py
@@ -1,6 +1,16 @@
 import logging
 
+from gunicorn import glogging
+
 
 class HealthCheckFilter(logging.Filter):
     def filter(self, record):
-        return 'ELB-HealthChecker/2.0' not in record
+        return 'ELB-HealthChecker' not in record.getMessage()
+
+
+class CustomGunicornLogger(glogging.Logger):
+    def setup(self, cfg):
+        super().setup(cfg)
+
+        logger = logging.getLogger('gunicorn.access')
+        logger.addFilter(HealthCheckFilter())
diff --git a/src/pyback/settings.py b/src/pyback/settings.py
@@ -9,14 +9,11 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/2.1/ref/settings/
 """
-import logging
-
-from dotenv import load_dotenv
-from decouple import config
-from pathlib import Path
 import os
+from pathlib import Path
 
-from .log import HealthCheckFilter
+from decouple import config
+from dotenv import load_dotenv
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -178,5 +175,3 @@
 
 if DEBUG:
     INTERNAL_IPS = ['127.0.0.1']
-
-logging.getLogger().addFilter(HealthCheckFilter())
