Renamed data.dir option to starter.data-dir

Author: ewoutp

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changes from version 0.7.0 to master
 
 - Added pass through options. See README.
+- Changed `--data.dir` option to `--starter.data-dir`
 
 # Changes from version 0.6.0 to 0.7.0
 

README.md

@@ -65,7 +65,7 @@ the console.
 Additional servers can be added in the same way.
 
 If two or more of the `arangodb` instances run on the same machine,
-one has to use the `--data.dir` option to let each use a different
+one has to use the `--starter.data-dir` option to let each use a different
 directory.
 
 The `arangodb` program will find the ArangoDB executable and the
@@ -148,7 +148,7 @@ docker run -it --name=adb --rm -p 8528:8528 \
 Common options 
 --------------
 
-* `--data.dir=path`
+* `--starter.data-dir=path`
 
 `path` is the directory in which all data is stored. (default "./")
 

main.go

@@ -108,8 +108,7 @@ func init() {
 	f.StringVar(&id, "starter.id", "", "Unique identifier of this peer")
 	f.IntVar(&masterPort, "starter.port", service.DefaultMasterPort, "Port to listen on for other arangodb's to join")
 	f.BoolVar(&allPortOffsetsUnique, "starter.unique-port-offsets", false, "If set, all peers will get a unique port offset. If false (default) only portOffset+peerAddress pairs will be unique.")
-
-	f.StringVar(&dataDir, "data.dir", getEnvVar("DATA_DIR", "."), "directory to store all data")
+	f.StringVar(&dataDir, "starter.data-dir", getEnvVar("DATA_DIR", "."), "directory to store all data the starter generates (and holds actual database directories)")
 
 	f.BoolVar(&verbose, "log.verbose", false, "Turn on debug logging")
 
@@ -190,7 +189,8 @@ var (
 		"startCoordinator":    "cluster.start-coordinator",
 		"startDBserver":       "cluster.start-dbserver",
 		"agencySize":          "cluster.agency-size",
-		"dataDir":             "data.dir",
+		"dataDir":             "starter.data-dir",
+		"data.dir":            "starter.data-dir",
 		"verbose":             "log.verbose",
 		"arangod":             "server.arangod",
 		"jsDir":               "server.js-dir",

service/runner_process.go

@@ -112,7 +112,7 @@ func (r *processRunner) CreateStartArangodbCommand(myDataDir string, index int,
 	} else {
 		dataDir = fmt.Sprintf("./db%d", index)
 	}
-	return fmt.Sprintf("arangodb --data.dir=%s --starter.join %s", dataDir, addr)
+	return fmt.Sprintf("arangodb --starter.data-dir=%s --starter.join %s", dataDir, addr)
 }
 
 // Cleanup after all processes are dead and have been cleaned themselves