Clearing registration information irrespective of whether or not dere…

…gistering works
getlantern · Mar 1, 2015 · 280d9c4 · 280d9c4
1 parent 99d43e6
commit 280d9c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/github.com/getlantern/peerscanner/group.go b/src/github.com/getlantern/peerscanner/group.go
@@ -39,13 +39,13 @@ func (g *group) deregister(h *host) {
 
 	log.Debugf("Deregistering from %v: %v", g.subdomain, h)
 
+	g.existing = nil
+	g.isProxying = false
+
 	// Destroy the record in the rotation...
 	err := cfutil.DestroyRecord(g.existing)
 	if err != nil {
 		log.Errorf("Unable to deregister host %v from rotation %v: %v", h, g.subdomain, err)
 		return
 	}
-
-	g.existing = nil
-	g.isProxying = false
 }
diff --git a/src/github.com/getlantern/peerscanner/host.go b/src/github.com/getlantern/peerscanner/host.go
@@ -346,14 +346,14 @@ func (h *host) deregisterHost() {
 }
 
 func (h *host) doDeregisterHost() error {
+	h.record = nil
+	h.isProxying = false
+
 	err := cfutil.DestroyRecord(h.record)
 	if err != nil {
 		return fmt.Errorf("Unable to deregister host %v: %v", h, err)
 	}
 
-	h.record = nil
-	h.isProxying = false
-
 	return nil
 }