1 files changed, 2 insertions, 17 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go
index 4c36f5a46..d2abbffb9 100644
--- a/cmd/platform/server.go
+++ b/cmd/platform/server.go
@@ -117,8 +117,8 @@ func runServer(configFileLocation string) {
 		manualtesting.Init(api3)
 	}
 
-	setDiagnosticId(a)
-	utils.RegenerateClientConfig()
+	a.EnsureDiagnosticId()
+
 	go runSecurityJob(a)
 	go runDiagnosticsJob(a)
 
@@ -205,21 +205,6 @@ func resetStatuses(a *app.App) {
 	}
 }
 
-func setDiagnosticId(a *app.App) {
-	if result := <-a.Srv.Store.System().Get(); result.Err == nil {
-		props := result.Data.(model.StringMap)
-
-		id := props[model.SYSTEM_DIAGNOSTIC_ID]
-		if len(id) == 0 {
-			id = model.NewId()
-			systemId := &model.System{Name: model.SYSTEM_DIAGNOSTIC_ID, Value: id}
-			<-a.Srv.Store.System().Save(systemId)
-		}
-
-		utils.CfgDiagnosticId = id
-	}
-}
-
 func doSecurity(a *app.App) {
 	a.DoSecurityUpdateCheck()
 }