From b202828360ce990a30ce5864b67e1c1b25c481c5 Mon Sep 17 00:00:00 2001
From: Christophe Siraut <csiraut@entrouvert.com>
Date: Thu, 10 Sep 2020 14:25:16 +0200
Subject: [PATCH] misc: display unit name

---
 logtracker/journal/management/commands/dump.py       | 3 ++-
 logtracker/journal/models.py                         | 4 ++++
 logtracker/journal/templates/journal/entry_list.html | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/logtracker/journal/management/commands/dump.py b/logtracker/journal/management/commands/dump.py
index 609e3d8..82718e9 100644
--- a/logtracker/journal/management/commands/dump.py
+++ b/logtracker/journal/management/commands/dump.py
@@ -20,9 +20,10 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         _, columns = os.popen("stty size", "r").read().split()
         for entry in Entry.objects.dump(lines=options['lines']):
-            line = "%s %s %s" % (
+            line = "%s %s %s %s" % (
                 entry.timestamp.astimezone().strftime("%b %d %X"),
                 entry.host,
+                entry.unit,
                 entry.data.get("MESSAGE"),
             )
             priority = entry.data.get("PRIORITY")
diff --git a/logtracker/journal/models.py b/logtracker/journal/models.py
index 4ddd49b..89ccf50 100644
--- a/logtracker/journal/models.py
+++ b/logtracker/journal/models.py
@@ -26,3 +26,7 @@ class Entry(models.Model):
 
     def __str__(self):
         return '%s %s %s' % (self.timestamp, self.host, self.data)
+
+    @property
+    def unit(self):
+        return self.data.get('_SYSTEMD_UNIT', '').replace('.service', '')
diff --git a/logtracker/journal/templates/journal/entry_list.html b/logtracker/journal/templates/journal/entry_list.html
index ad49b76..4988689 100644
--- a/logtracker/journal/templates/journal/entry_list.html
+++ b/logtracker/journal/templates/journal/entry_list.html
@@ -9,6 +9,7 @@
         <tr>
             <td>Time</td>
             <td>Host</td>
+            <td>Unit</td>
             <td>Message</td>
         </tr>
     </thead>
@@ -17,6 +18,7 @@
     <tr>
         <td>{{ line.timestamp|date:'b d H:i:s' }}</td>
         <td>{{ line.host }}</td>
+        <td>{{ line.unit }}</td>
         <td>{{ line.data.MESSAGE }}</td>
     </tr>
 {% empty %}