Merge pull request #218 from alphagov/add-app-name

Add app name as a tag to json logs

backdrop/core/log_handler.py

@@ -12,10 +12,10 @@ def get_log_file_handler(path, log_level=logging.DEBUG):
     return handler
 
 
-def get_json_log_handler(path):
+def get_json_log_handler(path, app_name):
     handler = FileHandler(path)
     formatter = LogstashFormatter()
-    formatter.defaults['@tags'] = ['application']
+    formatter.defaults['@tags'] = ['application', app_name]
     handler.setFormatter(formatter)
     return handler
 
@@ -26,7 +26,7 @@ def set_up_logging(app, env):
         get_log_file_handler("log/%s.log" % env, log_level)
     )
     app.logger.addHandler(
-        get_json_log_handler("log/%s.log.json" % env)
+        get_json_log_handler("log/%s.log.json" % env, app.name)
     )
     app.logger.setLevel(log_level)
     app.logger.info("{} logging started".format(app.name))

requirements.txt

@@ -10,4 +10,4 @@ pytz==2013b
 rauth==0.5.5
 statsd==2.0.3
 xlrd==0.9.2
--e git+https://github.com/alphagov/python-logstash-formatter.git@fix-docstring#egg=logstash_formatter
+logstash_formatter==0.5.7

tests/core/test_json_logging.py

@@ -27,7 +27,7 @@ def test_json_log_written_when_logger_called(self):
         }))
 
         assert_that(data, has_entries({
-            '@tags': ['application']
+            '@tags': ['application', 'json_test_app']
         }))
 
         # Only remove file if assertion passes