From 384448d12326d68e306c08050967053f268a6f3c Mon Sep 17 00:00:00 2001 From: Cedric Verstraeten Date: Mon, 31 Jul 2023 08:49:34 +0200 Subject: [PATCH] panic when no mongodb + remove files when no longer available + do not cleanup recordings by default, however cleanup when recordings have been uploaded --- machinery/src/capture/main.go | 2 +- machinery/src/cloud/KerberosHub.go | 2 +- machinery/src/cloud/KerberosVault.go | 2 +- machinery/src/components/Config.go | 12 ++++++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/machinery/src/capture/main.go b/machinery/src/capture/main.go index a7a6065..82ca5d2 100644 --- a/machinery/src/capture/main.go +++ b/machinery/src/capture/main.go @@ -19,7 +19,7 @@ import ( func CleanupRecordingDirectory(configDirectory string, configuration *models.Configuration) { autoClean := configuration.Config.AutoClean - if autoClean != "false" { + if autoClean == "true" { maxSize := configuration.Config.MaxDirectorySize if maxSize == 0 { maxSize = 300 diff --git a/machinery/src/cloud/KerberosHub.go b/machinery/src/cloud/KerberosHub.go index 783f4c1..59aaea9 100644 --- a/machinery/src/cloud/KerberosHub.go +++ b/machinery/src/cloud/KerberosHub.go @@ -44,7 +44,7 @@ func UploadKerberosHub(configuration *models.Configuration, fileName string) (bo if err != nil { err := "UploadKerberosHub: Upload Failed, file doesn't exists anymore." log.Log.Info(err) - return false, true, errors.New(err) + return false, false, errors.New(err) } // Check if we are allowed to upload to the hub with these credentials. diff --git a/machinery/src/cloud/KerberosVault.go b/machinery/src/cloud/KerberosVault.go index d57eac2..9abdf1f 100644 --- a/machinery/src/cloud/KerberosVault.go +++ b/machinery/src/cloud/KerberosVault.go @@ -44,7 +44,7 @@ func UploadKerberosVault(configuration *models.Configuration, fileName string) ( if err != nil { err := "UploadKerberosVault: Upload Failed, file doesn't exists anymore." log.Log.Info(err) - return false, true, errors.New(err) + return false, false, errors.New(err) } publicKey := config.KStorage.CloudKey diff --git a/machinery/src/components/Config.go b/machinery/src/components/Config.go index 262fa6d..b7286f5 100644 --- a/machinery/src/components/Config.go +++ b/machinery/src/components/Config.go @@ -90,11 +90,18 @@ func OpenConfig(configDirectory string, configuration *models.Configuration) { if res.Err() != nil { log.Log.Error("Could not find global configuration, using default configuration.") + panic("Could not find global configuration, using default configuration.") } err := res.Decode(&globalConfig) if err != nil { log.Log.Error("Could not find global configuration, using default configuration.") + panic("Could not find global configuration, using default configuration.") } + if globalConfig.Type != "global" { + log.Log.Error("Could not find global configuration, might missed the mongodb connection.") + panic("Could not find global configuration, might missed the mongodb connection.") + } + configuration.GlobalConfig = globalConfig var customConfig models.Config @@ -110,6 +117,11 @@ func OpenConfig(configDirectory string, configuration *models.Configuration) { if err != nil { log.Log.Error("Could not find configuration for " + deploymentName + ", using global configuration.") } + + if customConfig.Type != "config" { + log.Log.Error("Could not find custom configuration, might missed the mongodb connection.") + panic("Could not find custom configuration, might missed the mongodb connection.") + } configuration.CustomConfig = customConfig // We will merge both configs in a single config file.