Merge pull request #476 from amazonlinux/yell

Expose first-party errors on console
bottlerocket-os · Oct 29, 2019 · 5c3aee6 · 5c3aee6
2 parents 39a0660 + c32594e
commit 5c3aee6
Show file tree

Hide file tree

Showing 41 changed files with 338 additions and 448 deletions.
diff --git a/packages/release/prepare-local.service b/packages/release/prepare-local.service
@@ -36,6 +36,7 @@ ExecStart=/usr/lib/systemd/systemd-growfs ${LOCAL_DIR}
 ExecStart=/usr/bin/mkdir -p ${LOCAL_DIR}/var ${LOCAL_DIR}/opt
 
 RemainAfterExit=false
+StandardError=journal+console
 
 [Install]
 WantedBy=local-fs.target
diff --git a/packages/workspaces/apiserver.service b/packages/workspaces/apiserver.service
@@ -5,7 +5,8 @@ Requires=storewolf.service migrator.service
 
 [Service]
 Type=notify
-ExecStart=/usr/bin/apiserver --datastore-path /var/lib/thar/datastore/current --socket-gid 274 -v -v -v
+ExecStart=/usr/bin/apiserver --datastore-path /var/lib/thar/datastore/current --socket-gid 274
+StandardError=journal+console
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/workspaces/migrator.service b/packages/workspaces/migrator.service
@@ -3,8 +3,9 @@ Description=Thar data store migrator
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/migrator --datastore-path /var/lib/thar/datastore/current --migration-directories /var/lib/thar/datastore/migrations --migrate-to-version-from-file /usr/share/thar/data-store-version -v -v
+ExecStart=/usr/bin/migrator --datastore-path /var/lib/thar/datastore/current --migration-directories /var/lib/thar/datastore/migrations --migrate-to-version-from-file /usr/share/thar/data-store-version
 RemainAfterExit=true
+StandardError=journal+console
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/workspaces/moondog.service b/packages/workspaces/moondog.service
@@ -11,6 +11,7 @@ ConditionPathExists=!/var/lib/thar/moondog.ran
 Type=oneshot
 ExecStart=/usr/bin/moondog
 RemainAfterExit=true
+StandardError=journal+console
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/workspaces/settings-applier.service b/packages/workspaces/settings-applier.service
@@ -8,6 +8,7 @@ Wants=settings-committer.service
 Type=oneshot
 ExecStart=/usr/bin/thar-be-settings --all
 RemainAfterExit=true
+StandardError=journal+console
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/workspaces/settings-committer.service b/packages/workspaces/settings-committer.service
@@ -8,6 +8,7 @@ Wants=storewolf.service sundog.service moondog.service
 Type=oneshot
 ExecStart=/usr/bin/settings-committer
 RemainAfterExit=true
+StandardError=journal+console
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/workspaces/storewolf.service b/packages/workspaces/storewolf.service
@@ -7,6 +7,7 @@ Requires=migrator.service
 Type=oneshot
 ExecStart=/usr/bin/storewolf --data-store-base-path /var/lib/thar/datastore
 RemainAfterExit=true
+StandardError=journal+console
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/workspaces/sundog.service b/packages/workspaces/sundog.service
@@ -8,6 +8,7 @@ Requires=network-online.target apiserver.service
 Type=oneshot
 ExecStart=/usr/bin/sundog
 RemainAfterExit=true
+StandardError=journal+console
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/workspaces/updog.service b/packages/workspaces/updog.service
@@ -4,3 +4,4 @@ Description=What's Updog?
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/updog check-update
+StandardError=journal+console