Merge "Added uwsgi_name information into fluentFormatter event message"victoria-em4.4.0

1 files changed, 10 insertions, 0 deletions

diff --git a/oslo_log/formatters.py b/oslo_log/formatters.py
index 8ca3f7e..a0a14b5 100644
--- a/oslo_log/formatters.py
+++ b/oslo_log/formatters.py
@@ -290,6 +290,13 @@ class FluentFormatter(logging.Formatter):
         except socket.error:
             self.hostname = None
         self.cmdline = " ".join(sys.argv)
+        try:
+            # check if running under uwsgi
+            import uwsgi
+            svc_name = uwsgi.opt.get("name")
+            self.uwsgi_name = svc_name
+        except Exception:
+            self.uwsgi_name = None
 
     def formatException(self, exc_info, strip_newlines=True):
         try:
@@ -351,6 +358,9 @@ class FluentFormatter(logging.Formatter):
         if record.exc_info:
             message['traceback'] = self.formatException(record.exc_info)
 
+        if self.uwsgi_name:
+            message["uwsgi_name"] = self.uwsgi_name
+
         return message