Combined metricstore api and functions

cmd/cc-backend/main.go

@@ -248,8 +248,10 @@ func main() {
 		cclog.Exit("No errors, server flag not set. Exiting cc-backend.")
 	}
 
+	var wg sync.WaitGroup
+
 	//Metric Store starts after all flags have been processes
-	memorystore.Init()
+	memorystore.Init(wg)
 
 	archiver.Start(repository.GetJobRepository())
 
@@ -259,8 +261,6 @@ func main() {
 
 	serverInit()
 
-	var wg sync.WaitGroup
-
 	wg.Add(1)
 	go func() {
 		defer wg.Done()