From 9e76e42e3c22dcf1eca9531c7320e770e0729eba Mon Sep 17 00:00:00 2001 From: Dalton Date: Fri, 5 Jun 2020 14:52:30 -0500 Subject: [PATCH] AUTH-2687 don't copy config unnecessarily --- cmd/cloudflared/linux_service.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cmd/cloudflared/linux_service.go b/cmd/cloudflared/linux_service.go index 43d4ca83..99ec9c27 100644 --- a/cmd/cloudflared/linux_service.go +++ b/cmd/cloudflared/linux_service.go @@ -184,17 +184,24 @@ func copyUserConfiguration(userConfigDir, userConfigFile, userCredentialFile str if err := ensureConfigDirExists(serviceConfigDir); err != nil { return err } + srcCredentialPath := filepath.Join(userConfigDir, userCredentialFile) destCredentialPath := filepath.Join(serviceConfigDir, serviceCredentialFile) - if err := copyCredential(srcCredentialPath, destCredentialPath); err != nil { - return err + if srcCredentialPath != destCredentialPath { + if err := copyCredential(srcCredentialPath, destCredentialPath); err != nil { + return err + } } + srcConfigPath := filepath.Join(userConfigDir, userConfigFile) destConfigPath := filepath.Join(serviceConfigDir, serviceConfigFile) - if err := copyConfig(srcConfigPath, destConfigPath); err != nil { - return err + if srcConfigPath != destConfigPath { + if err := copyConfig(srcConfigPath, destConfigPath); err != nil { + return err + } + logger.Infof("Copied %s to %s", srcConfigPath, destConfigPath) } - logger.Infof("Copied %s to %s", srcConfigPath, destConfigPath) + return nil }