Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 593ba74e authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

Error tracking

parent d0a27b35

.env.prod

+3 −0
Original line number Diff line number Diff line
@@ -10,3 +10,6 @@ FILTRON_PORT=8088 
INTERNAL_NETWORK_NAME=default

NODE_NAME=spot11

CI_REGISTRY_IMAGE=image

SENTRY_DSN=public_key:gitlab.com

SENTRY_TRACES_SAMPLE_RATE=1.0

ENVIRONMENT_NAME=prod

.gitlab-ci.yml

+12 −0
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ deploy:spot.eeo.one.backend1: 
      && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

      && sed -i 's/NODE_NAME=spot11/NODE_NAME=$NODE_NAME/g' .env

      && sed -i 's/ENVIRONMENT_NAME=prod/ENVIRONMENT_NAME=$ENVIRONMENT_NAME/g' .env

      && sed -i 's|SENTRY_DSN=public_key:gitlab.com|SENTRY_DSN=$SENTRY_DSN|g' .env

      && sed -i 's|SENTRY_TRACES_SAMPLE_RATE=1.0|SENTRY_TRACES_SAMPLE_RATE=$SENTRY_TRACES_SAMPLE_RATE|g' .env

      && sed -i 's|CI_REGISTRY_IMAGE=image|CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE|g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"
@@ -135,6 +138,9 @@ deploy:spot.eeo.one.backend2: 
      && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

      && sed -i 's/NODE_NAME=spot11/NODE_NAME=$NODE_NAME/g' .env

      && sed -i 's/ENVIRONMENT_NAME=prod/ENVIRONMENT_NAME=$ENVIRONMENT_NAME/g' .env

      && sed -i 's|SENTRY_DSN=public_key:gitlab.com|SENTRY_DSN=$SENTRY_DSN|g' .env

      && sed -i 's|SENTRY_TRACES_SAMPLE_RATE=1.0|SENTRY_TRACES_SAMPLE_RATE=$SENTRY_TRACES_SAMPLE_RATE|g' .env

      && sed -i 's|CI_REGISTRY_IMAGE=image|CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE|g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 5 && docker-compose up -d"
@@ -168,6 +174,9 @@ deploy:spot.ecloud.global.backend1: 
      && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

      && sed -i 's/NODE_NAME=spot11/NODE_NAME=$NODE_NAME/g' .env

      && sed -i 's/ENVIRONMENT_NAME=prod/ENVIRONMENT_NAME=$ENVIRONMENT_NAME/g' .env

      && sed -i 's|SENTRY_DSN=public_key:gitlab.com|SENTRY_DSN=$SENTRY_DSN|g' .env

      && sed -i 's|SENTRY_TRACES_SAMPLE_RATE=1.0|SENTRY_TRACES_SAMPLE_RATE=$SENTRY_TRACES_SAMPLE_RATE|g' .env

      && sed -i 's|CI_REGISTRY_IMAGE=image|CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE|g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"
@@ -201,6 +210,9 @@ deploy:spot.ecloud.global.backend2: 
      && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

      && sed -i 's/NODE_NAME=spot11/NODE_NAME=$NODE_NAME/g' .env

      && sed -i 's/ENVIRONMENT_NAME=prod/ENVIRONMENT_NAME=$ENVIRONMENT_NAME/g' .env

      && sed -i 's|SENTRY_DSN=public_key:gitlab.com|SENTRY_DSN=$SENTRY_DSN|g' .env

      && sed -i 's|SENTRY_TRACES_SAMPLE_RATE=1.0|SENTRY_TRACES_SAMPLE_RATE=$SENTRY_TRACES_SAMPLE_RATE|g' .env

      && sed -i 's|CI_REGISTRY_IMAGE=image|CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE|g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"

docker-compose.prod.yml

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ services: 
      GUNICORN_LOGGER: 1

      GUNICORN_LEVEL: INFO

      NODE_NAME: "${NODE_NAME}"

      SENTRY_DSN: "${SENTRY_DSN}"

      SENTRY_TRACES_SAMPLE_RATE: "${SENTRY_TRACES_SAMPLE_RATE}"

      ENVIRONMENT_NAME: "${ENVIRONMENT_NAME}"



  spot-nginx:

    image: nginx:1.21

requirements.txt

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ babel==2.9.1 
flask-babel==2.0.0

flask==2.0.2

jinja2==3.0.3

sentry-sdk[flask]==1.5.9

lxml==4.7.1

pygments==2.8.0

python-dateutil==2.8.2

searx/webapp.py

+25 −0
Original line number Diff line number Diff line
@@ -103,6 +103,31 @@ from searx.settings_loader import get_default_settings_path 
from werkzeug.serving import WSGIRequestHandler

WSGIRequestHandler.protocol_version = "HTTP/{}".format(settings['server'].get('http_protocol_version', '1.0'))





# Enable sentry only if SENTRY_DSN variable is set

if os.getenv('SENTRY_DSN', None) is not None:

    import sentry_sdk

    from sentry_sdk.integrations.flask import FlaskIntegration



    sentry_sdk.init(

        dsn=os.getenv("SENTRY_DSN"),

        integrations=[FlaskIntegration()],

        environment=os.getenv("ENVIRONMENT_NAME"),

        server_name=os.getenv("ENVIRONMENT_NAME"),



        # Set traces_sample_rate to 1.0 to capture 100%

        # of transactions for performance monitoring.

        # We recommend adjusting this value in production.

        traces_sample_rate=float(os.getenv("SENTRY_TRACES_SAMPLE_RATE", 1.0)),



        # By default the SDK will try to use the SENTRY_RELEASE

        # environment variable, or infer a git commit

        # SHA as release, however you may want to set

        # something more human-readable.

        release="spot@{}".format(os.getenv("ENVIRONMENT_NAME")),

    )





# check secret_key

if not searx_debug and settings['server']['secret_key'] == 'ultrasecretkey':

    logger.error('server.secret_key is not changed. Please use something else instead of ultrasecretkey.')