Made config more flexible

Author: ewoutp

service/arangodb.go

@@ -168,7 +168,7 @@ var confFileTemplate = `# ArangoDB configuration file
 [server]
 endpoint = tcp://0.0.0.0:%s
 threads = %d
-authentication = false
+%s 
 
 [log]
 level = %s
@@ -190,20 +190,51 @@ func (s *Service) makeBaseArgs(myHostDir, myContainerDir string, myAddress strin
 	}
 
 	if _, err := os.Stat(hostConfFileName); os.IsNotExist(err) {
-		out, e := os.Create(hostConfFileName)
-		if e != nil {
-			s.log.Fatalf("Could not create configuration file %s, error: %#v", hostConfFileName, e)
-		}
+		var threads, v8Contexts string
+		logLevel := "INFO"
 		switch mode {
 		// Parameters are: port, server threads, log level, v8-contexts
 		case "agent":
-			fmt.Fprintf(out, confFileTemplate, myPort, 8, "INFO", 1)
+			threads = "8"
+			v8Contexts = "1"
 		case "dbserver":
-			fmt.Fprintf(out, confFileTemplate, myPort, 4, "INFO", 4)
+			threads = "4"
+			v8Contexts = "4"
 		case "coordinator":
-			fmt.Fprintf(out, confFileTemplate, myPort, 16, "INFO", 4)
+			threads = "16"
+			v8Contexts = "4"
+		}
+		config := configFile{
+			&configSection{
+				Name: "server",
+				Settings: map[string]string{
+					"endpoint":       fmt.Sprintf("tcp://0.0.0.0:%s", myPort),
+					"threads":        threads,
+					"authentication": "false",
+				},
+			},
+			&configSection{
+				Name: "log",
+				Settings: map[string]string{
+					"level": logLevel,
+				},
+			},
+			&configSection{
+				Name: "javascript",
+				Settings: map[string]string{
+					"v8-contexts": v8Contexts,
+				},
+			},
 		}
+		out, e := os.Create(hostConfFileName)
+		if e != nil {
+			s.log.Fatalf("Could not create configuration file %s, error: %#v", hostConfFileName, e)
+		}
+		_, err := config.WriteTo(out)
 		out.Close()
+		if err != nil {
+			s.log.Fatalf("Cannot create config file: %v", err)
+		}
 	}
 	args = make([]string, 0, 40)
 	executable := s.ArangodExecutable

service/config.go

@@ -0,0 +1,51 @@
+package service
+
+import (
+	"fmt"
+	"io"
+	"strings"
+)
+
+var confHeader = `# ArangoDB configuration file
+#
+# Documentation:
+# https://docs.arangodb.com/Manual/Administration/Configuration/
+#
+
+`
+
+type configFile []*configSection
+
+// WriteTo writes the configuration sections to the given writer.
+func (cf configFile) WriteTo(w io.Writer) (int64, error) {
+	x := int64(0)
+	n, err := w.Write([]byte(confHeader))
+	if err != nil {
+		return x, maskAny(err)
+	}
+	x += int64(n)
+	for _, section := range cf {
+		n, err := section.WriteTo(w)
+		if err != nil {
+			return x, maskAny(err)
+		}
+		x += int64(n)
+	}
+	return x, nil
+}
+
+type configSection struct {
+	Name     string
+	Settings map[string]string
+}
+
+// WriteTo writes the configuration section to the given writer.
+func (s *configSection) WriteTo(w io.Writer) (int64, error) {
+	lines := []string{"[" + s.Name + "]"}
+	for k, v := range s.Settings {
+		lines = append(lines, fmt.Sprintf("%s = %s", k, v))
+	}
+	lines = append(lines, "")
+	n, err := w.Write([]byte(strings.Join(lines, "\n")))
+	return int64(n), maskAny(err)
+}