From 307a122518d20e39ff3ab31772ece8bff9c4472e Mon Sep 17 00:00:00 2001
From: Asaf Gartner <asaf@handmadedev.org>
Date: Sat, 4 Sep 2021 21:59:03 +0300
Subject: [PATCH] Another attempt at crash mailing

---
 server/adminmailer.sh        | 2 +-
 server/caddy.service         | 2 +-
 server/cinera.service        | 2 +-
 server/hmn.service           | 2 +-
 server/serversetup.sh        | 2 --
 server/status-email@.service | 8 --------
 src/migration/migration.go   | 3 ++-
 7 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 server/status-email@.service

diff --git a/server/adminmailer.sh b/server/adminmailer.sh
index f4a6e8c..dd6bdd1 100755
--- a/server/adminmailer.sh
+++ b/server/adminmailer.sh
@@ -5,5 +5,5 @@ if [ $SERVICE_RESULT == "success" ]; then
 fi
 
 /home/hmn/hmn/adminmailer/adminmailer "[$1] Status changed" <<ERRMAIL
-$(service "$1" status)
+$(systemctl status --full "$1")
 ERRMAIL
diff --git a/server/caddy.service b/server/caddy.service
index 8244dc5..f6d560c 100644
--- a/server/caddy.service
+++ b/server/caddy.service
@@ -28,7 +28,7 @@ LimitNPROC=512
 PrivateTmp=true
 ProtectSystem=full
 AmbientCapabilities=CAP_NET_BIND_SERVICE
-ExecStopPost=status-email@%n.service
+ExecStopPost=/home/hmn/hmn/server/adminmailer.sh %n
 
 [Install]
 WantedBy=multi-user.target
diff --git a/server/cinera.service b/server/cinera.service
index c7cb839..c0e7193 100644
--- a/server/cinera.service
+++ b/server/cinera.service
@@ -10,7 +10,7 @@ ExecStart=/home/hmn/hmn/cinera/start.sh
 ExecStop=/home/hmn/hmn/cinera/stop.sh
 PIDFile=/home/hmn/hmn/cinera/data/cinera.pid
 Restart=always
-ExecStopPost=status-email@%n.service
+ExecStopPost=/home/hmn/hmn/server/adminmailer.sh %n
 
 [Install]
 WantedBy=multi-user.target
diff --git a/server/hmn.service b/server/hmn.service
index d36e778..1001895 100644
--- a/server/hmn.service
+++ b/server/hmn.service
@@ -8,7 +8,7 @@ Group=hmn
 ExecStart=/home/hmn/bin/hmn
 Restart=always
 TimeoutStopSec=15
-ExecStopPost=status-email@%n.service
+ExecStopPost=/home/hmn/hmn/server/adminmailer.sh %n
 
 [Install]
 WantedBy=multi-user.target
diff --git a/server/serversetup.sh b/server/serversetup.sh
index c547f5a..d4bebe0 100755
--- a/server/serversetup.sh
+++ b/server/serversetup.sh
@@ -199,11 +199,9 @@ if [ $checkpoint -lt 100 ]; then
     cp /home/hmn/hmn/server/caddy.service /etc/systemd/system/caddy.service
     cp /home/hmn/hmn/server/hmn.service /etc/systemd/system/hmn.service
     cp /home/hmn/hmn/server/cinera.service /etc/systemd/system/cinera.service
-    cp /home/hmn/hmn/server/status-email@.service /etc/systemd/system/status-email@.service
     chmod 644 /etc/systemd/system/caddy.service
     chmod 644 /etc/systemd/system/hmn.service
     chmod 644 /etc/systemd/system/cinera.service
-    chmod 644 /etc/systemd/system/status-email@.service
 
     cp /home/hmn/hmn/server/logrotate /etc/logrotate.d/hmn
     
diff --git a/server/status-email@.service b/server/status-email@.service
deleted file mode 100644
index 1ff34fc..0000000
--- a/server/status-email@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Status email for %i
-
-[Service]
-Type=oneshot
-ExecStart=/home/hmn/hmn/server/adminmailer.sh %i
-User=root
-Group=systemd-journal
diff --git a/src/migration/migration.go b/src/migration/migration.go
index a8a85ba..a4b74e7 100644
--- a/src/migration/migration.go
+++ b/src/migration/migration.go
@@ -365,7 +365,8 @@ func SeedFromFile(seedFile string, afterMigration types.MigrationVersion) {
 		seedFile,
 	)
 	fmt.Println("Running command:", cmd)
-	if err = cmd.Run(); err != nil {
+	if output, err := cmd.CombinedOutput(); err != nil {
+		fmt.Print(string(output))
 		exitError, isExit := err.(*exec.ExitError)
 		if isExit {
 			panic(fmt.Errorf("failed to execute seed: %w\n%s", err, string(exitError.Stderr)))