From 22d33f743dbb6a8416505c1d336db3ffc84b7878 Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Fri, 3 Sep 2021 15:12:07 +0000
Subject: [PATCH] Make sure the remove user runs
---
cmd/ud.go | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/cmd/ud.go b/cmd/ud.go
index 3553ed6c5..96484e6ff 100644
--- a/cmd/ud.go
+++ b/cmd/ud.go
@@ -184,6 +184,25 @@ var udCmd = &cobra.Command{
facts = append(facts, f)
}
+ userToRemove := viper.GetString("remove")
+ if userToRemove != "" {
+ f, err := fact.NewFact(fact.Username, userToRemove)
+ if err != nil {
+ jww.FATAL.Panicf(
+ "Failed to create new fact: %+v", err)
+ }
+ err = userDiscoveryMgr.RemoveUser(f)
+ if err != nil {
+ fmt.Printf("Couldn't remove user %s",
+ userToRemove)
+ jww.FATAL.Panicf(
+ "Failed to remove user %s: %+v",
+ userToRemove, err)
+ }
+ fmt.Printf("Removed user from discovery: %s",
+ userToRemove)
+ }
+
if len(facts) == 0 {
err = client.StopNetworkFollower()
if err != nil {
@@ -205,25 +224,6 @@ var udCmd = &cobra.Command{
jww.FATAL.Panicf("%+v", err)
}
- userToRemove := viper.GetString("remove")
- if userToRemove != "" {
- f, err := fact.NewFact(fact.Username, userToRemove)
- if err != nil {
- jww.FATAL.Panicf(
- "Failed to create new fact: %+v", err)
- }
- err = userDiscoveryMgr.RemoveUser(f)
- if err != nil {
- fmt.Printf("Couldn't remove user %s",
- userToRemove)
- jww.FATAL.Panicf(
- "Failed to remove user %s: %+v",
- userToRemove, err)
- }
- fmt.Printf("Removed user from discovery: %s",
- userToRemove)
- }
-
time.Sleep(91 * time.Second)
err = client.StopNetworkFollower()
if err != nil {
--
GitLab