From 25078ac838920e4010ecdbe4546af0d4b502dabd Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy.zelinskie+git@gmail.com>
Date: Wed, 9 Jan 2019 16:16:17 -0500
Subject: [PATCH] ext: add CleanAll() utility functions

---
 ext/vulnmdsrc/driver.go |  8 ++++++++
 ext/vulnsrc/driver.go   |  8 ++++++++
 updater.go              | 11 +++--------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ext/vulnmdsrc/driver.go b/ext/vulnmdsrc/driver.go
index d1da7c31..b767a25e 100644
--- a/ext/vulnmdsrc/driver.go
+++ b/ext/vulnmdsrc/driver.go
@@ -86,3 +86,11 @@ func Appenders() map[string]Appender {
 
 	return ret
 }
+
+// CleanAll is a utility function that calls Clean() on every registered
+// Appender.
+func CleanAll() {
+	for _, appender := range Appenders() {
+		appender.Clean()
+	}
+}
diff --git a/ext/vulnsrc/driver.go b/ext/vulnsrc/driver.go
index 4a119c46..72ff4be4 100644
--- a/ext/vulnsrc/driver.go
+++ b/ext/vulnsrc/driver.go
@@ -93,3 +93,11 @@ func ListUpdaters() []string {
 	}
 	return r
 }
+
+// CleanAll is a utility function that calls Clean() on every registered
+// Updater.
+func CleanAll() {
+	for _, updater := range Updaters() {
+		updater.Clean()
+	}
+}
diff --git a/updater.go b/updater.go
index 88585165..427ab860 100644
--- a/updater.go
+++ b/updater.go
@@ -1,4 +1,4 @@
-// Copyright 2017 clair authors
+// Copyright 2019 clair authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -91,13 +91,8 @@ func RunUpdater(config *UpdaterConfig, datastore database.Datastore, st *stopper
 
 	// Clean up any resources the updater left behind.
 	defer func() {
-		for _, appenders := range vulnmdsrc.Appenders() {
-			appenders.Clean()
-		}
-		for _, updaters := range vulnsrc.Updaters() {
-			updaters.Clean()
-		}
-
+		vulnmdsrc.CleanAll()
+		vulnsrc.CleanAll()
 		log.Info("updater service stopped")
 	}()