Merge remote-tracking branch 'origin/master'

metabrainz · Aug 13, 2021 · b1c42b2 · b1c42b2
2 parents 54e7673 + 807eb69
commit b1c42b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -136,6 +136,7 @@ RUN touch /etc/service/dataset_eval/down
 
 # Add cron jobs
 COPY ./docker/cron/crontab /etc/cron.d/acousticbrainz
+RUN chmod 0644 /etc/cron.d/acousticbrainz
 COPY ./docker/cron/cron-config.service /etc/service/cron-config/run
 COPY docker/cron/consul-template-cron-config.conf /etc/consul-template-cron-config.conf
 RUN touch /etc/service/cron/down

diff --git a/webserver/errors.py b/webserver/errors.py
@@ -32,6 +32,11 @@ def not_found(error):
             return jsonify_error(error)
         return render_template('errors/404.html', error=error), 404
 
+    @app.errorhandler(429)
+    def too_many_requests(error):
+        # always returning JSON because this is only raised from API endpoints
+        return jsonify_error(error, 429)
+
     @app.errorhandler(500)
     def internal_server_error(error):
         if request.path.startswith(webserver.API_PREFIX):