fix install service method

- Fixed the service install plist
Parallels · Sep 16, 2024 · 6b0d1e1 · 6b0d1e1
1 parent f7e8598
commit 6b0d1e1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/install_cfg.json b/install_cfg.json
@@ -0,0 +1,4 @@
+{
+  "port": "5470",
+  "log_output": true
+}
diff --git a/src/config/main.go b/src/config/main.go
@@ -46,7 +46,7 @@ func New(ctx basecontext.ApiContext) *Config {
 		mode:       "api",
 		ctx:        ctx,
 		fileFormat: "yaml",
-		filename:   "config.yml",
+		filename:   "prldevops_config",
 		config:     ConfigFile{},
 	}
 
@@ -77,13 +77,22 @@ func (c *Config) Load() bool {
 			fileName = configFileName
 		}
 	} else {
+		configFolder := filepath.Join(filepath.Dir(execPath), "prldevops_config")
 		for _, extension := range extensions {
-			configFolder := filepath.Join(filepath.Dir(execPath), "config")
 			if _, err := os.Stat(fmt.Sprintf("%s%s", configFolder, extension)); !os.IsNotExist(err) {
 				fileName = fmt.Sprintf("%s%s", configFolder, extension)
 				break
 			}
 		}
+		if fileName == "" {
+			configFolder = filepath.Join(filepath.Dir(execPath), "config")
+			for _, extension := range extensions {
+				if _, err := os.Stat(fmt.Sprintf("%s%s", configFolder, extension)); !os.IsNotExist(err) {
+					fileName = fmt.Sprintf("%s%s", configFolder, extension)
+					break
+				}
+			}
+		}
 	}
 
 	if fileName == "" {
@@ -143,7 +152,7 @@ func (c *Config) Save() bool {
 		}
 	}
 
-	err = helper.WriteToFile(string(content), c.filename)
+	err = helper.WriteToFile(string(content), fmt.Sprintf("%s.%s", c.filename, c.fileFormat))
 	if err != nil {
 		c.ctx.LogErrorf("Error saving configuration file: %s", err.Error())
 		return false

diff --git a/src/install/mac_plist_daemon.go b/src/install/mac_plist_daemon.go
@@ -24,6 +24,7 @@ type PlistTemplateData struct {
 	TokenDurationMinutes     string
 	Mode                     string
 	UseOrchestratorResources string
+	LogOutput                bool
 }
 
 var plistTemplate = `<?xml version="1.0" encoding="UTF-8"?>
@@ -104,14 +105,14 @@ var plistTemplate = `<?xml version="1.0" encoding="UTF-8"?>
     <key>SuccessfulExit</key>
     <false/>
   </dict>
+  {{- if .LogOutput }}
   <key>StandardErrorPath</key>
-  <string>/tmp/api-service.job.err</string>
+  <string>/tmp/devops-service.job.err</string>
   <key>StandardOutPath</key>
-  <key>RunAtLoad</key>
-  <true/>
-  <string>/tmp/api-service.job.out</string> 
+  <string>/tmp/devops-service.job.out</string> 
+  {{- end }}
 </dict>
-</plist>"`
+</plist>`
 
 func generatePlist(path string, config ApiServiceConfig) (string, error) {
 	// Define the text template
@@ -136,6 +137,7 @@ func generatePlist(path string, config ApiServiceConfig) (string, error) {
 		TlsPrivateKey:        config.TLSPrivateKey,
 		TokenDurationMinutes: config.TokenDurationMinutes,
 		Mode:                 config.Mode,
+		LogOutput:            config.LogOutput,
 	}
 	if config.EnableTLS {
 		templateData.EnableTLS = "true"

diff --git a/src/install/service_config.go b/src/install/service_config.go
@@ -16,4 +16,5 @@ type ApiServiceConfig struct {
 	TokenDurationMinutes     string `json:"token_duration_minutes,omitempty"`
 	Mode                     string `json:"mode,omitempty"`
 	UseOrchestratorResources bool   `json:"use_orchestrator_resources,omitempty"`
+	LogOutput                bool   `json:"log_output,omitempty"`
 }