|
 |
7d26d3 |
From 31db6e5a21afb62183ea6721fd79d515fc9b77b9 Mon Sep 17 00:00:00 2001
|
|
|
7d26d3 |
From: Link Dupont <link@sub-pop.net>
|
|
|
7d26d3 |
Date: Wed, 30 Jun 2021 12:36:17 -0400
|
|
|
7d26d3 |
Subject: [PATCH 1/2] fix: Improve output during 'disconnect'
|
|
|
7d26d3 |
|
|
|
7d26d3 |
Now print the status of the disconnection process, including the results afterwards.
|
|
|
7d26d3 |
|
|
|
7d26d3 |
Fixes ESSNTL-837
|
|
|
7d26d3 |
|
|
|
7d26d3 |
Signed-off-by: Link Dupont <link@sub-pop.net>
|
|
|
7d26d3 |
---
|
|
|
7d26d3 |
cmd/ygg/main.go | 8 ++++++--
|
|
|
7d26d3 |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
7d26d3 |
|
|
|
7d26d3 |
diff --git a/cmd/ygg/main.go b/cmd/ygg/main.go
|
|
|
7d26d3 |
index 5226bce..f5c5c47 100644
|
|
|
7d26d3 |
--- a/cmd/ygg/main.go
|
|
|
7d26d3 |
+++ b/cmd/ygg/main.go
|
|
|
7d26d3 |
@@ -162,17 +162,21 @@ func main() {
|
|
|
7d26d3 |
fmt.Printf("Disconnecting %v from %v.\nThis might take a few seconds.\n\n", hostname, yggdrasil.Provider)
|
|
|
7d26d3 |
|
|
|
7d26d3 |
s := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
|
|
|
7d26d3 |
- defer s.Stop()
|
|
|
7d26d3 |
- s.Suffix = " Disconnecting..."
|
|
|
7d26d3 |
+ s.Suffix = fmt.Sprintf(" Deactivating the %v daemon", yggdrasil.BrandName)
|
|
|
7d26d3 |
s.Start()
|
|
|
7d26d3 |
if err := deactivate(); err != nil {
|
|
|
7d26d3 |
return cli.Exit(err, 1)
|
|
|
7d26d3 |
}
|
|
|
7d26d3 |
+ s.Stop()
|
|
|
7d26d3 |
+ fmt.Printf(failPrefix+" Deactivated the %v daemon\n", yggdrasil.BrandName)
|
|
|
7d26d3 |
|
|
|
7d26d3 |
+ s.Suffix = " Disconnecting from Red Hat Subscription Management..."
|
|
|
7d26d3 |
+ s.Start()
|
|
|
7d26d3 |
if err := unregister(); err != nil {
|
|
|
7d26d3 |
return cli.Exit(err, 1)
|
|
|
7d26d3 |
}
|
|
|
7d26d3 |
s.Stop()
|
|
|
7d26d3 |
+ fmt.Printf(failPrefix + " Disconnected from Red Hat Subscription Management\n")
|
|
|
7d26d3 |
|
|
|
7d26d3 |
fmt.Printf("\nManage your Red Hat connector systems: https://red.ht/connector\n")
|
|
|
7d26d3 |
|
|
|
7d26d3 |
--
|
|
|
7d26d3 |
2.31.1
|
|
|
7d26d3 |
|