Minor fixes to the log and stream process

src/catalog/cacheservice/main.go

@@ -192,7 +192,7 @@ func (cs *CacheService) checkNeedCleanup() (*CleanupRequirements, error) {
 
 	manifestUsedSize := cs.manifest.Size * 2
 	// if we can stream then we do no need the double size request
-	if cs.rss.CanStream() {
+	if cs.rss.CanStream() && cs.cfg.IsRemoteProviderStreamEnabled() {
 		manifestUsedSize = cs.manifest.Size
 	}
 

src/catalog/pull.go

@@ -490,8 +490,9 @@ func (s *CatalogManifestService) pullAndDecompressPackFile(r *models.PullCatalog
 	if rss == nil {
 		return errors.NewWithCode("Remote storage service is nil", 500)
 	}
+	cfg := config.Get()
 	cleanupSvc := cleanupservice.NewCleanupService()
-	if rss.CanStream() {
+	if rss.CanStream() && cfg.IsRemoteProviderStreamEnabled() {
 		if err := s.processFileWithStream(r.LocalMachineFolder, rss, manifest, cleanupSvc); err != nil {
 			return err
 		}

src/config/main.go

@@ -533,6 +533,15 @@ func (c *Config) EnableReverseProxy(value bool) bool {
 	return true
 }
 
+func (c *Config) IsRemoteProviderStreamEnabled() bool {
+	streamingDisabled := c.GetKey(constants.DISABLE_CATALOG_PROVIDER_STREAMING_ENV_VAR)
+	if streamingDisabled == "" {
+		return true
+	}
+
+	return !helpers.StringToBool(streamingDisabled)
+}
+
 func (c *Config) GetKey(key string) string {
 	value := helper.GetFlagValue(key, "")
 	exists := false

src/constants/main.go

@@ -86,6 +86,8 @@ const (
 	REVERSE_PROXY_PORT_ENV_VAR                  = "REVERSE_PROXY_PORT"
 	REVERSE_PROXY_HOST_ENV_VAR                  = "REVERSE_PROXY_HOST"
 	LOG_TO_FILE_ENV_VAR                         = "PRL_DEVOPS_LOG_TO_FILE"
+	LOG_FILE_PATH_ENV_VAR                       = "PRL_DEVOPS_LOG_FILE_PATH"
+	DISABLE_CATALOG_PROVIDER_STREAMING_ENV_VAR  = "DISABLE_CATALOG_PROVIDER_STREAMING"
 )
 
 const (

src/helpers/strings.go

@@ -129,3 +129,19 @@ func ObfuscateString(value string) string {
 func ClearLine() {
 	fmt.Printf("\r\033[K")
 }
+
+func StringToBool(s string) bool {
+	if s == "true" ||
+		s == "1" ||
+		s == "yes" ||
+		s == "y" ||
+		s == "t" ||
+		s == "on" ||
+		s == "enable" ||
+		s == "enabled" ||
+		s == "active" {
+		return true
+	}
+
+	return false
+}

src/main.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
+	"path/filepath"
 	"strings"
 	"syscall"
 	"time"
@@ -82,6 +83,16 @@ func main() {
 	enableLogToFile := os.Getenv(constants.LOG_TO_FILE_ENV_VAR)
 	if enableLogToFile == "true" {
 		logFilename := "prldevops.log"
+		filePath := os.Getenv(constants.LOG_FILE_PATH_ENV_VAR)
+		if filePath != "" {
+			baseFolder := filepath.Dir(filePath)
+			if _, err := os.Stat(baseFolder); os.IsNotExist(err) {
+				ctx.LogErrorf("[Core] Log file path does not exist: %s, using executable path", filePath)
+			} else {
+				logFilename = filepath.Join(filePath, logFilename)
+			}
+		}
+
 		executable, err := os.Executable()
 		if err == nil && !strings.Contains(executable, "__debug") {
 			logFilename = executable + ".log"