X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d3b56f18947c3ccb42fee52ff33b3b00db0dffd9..3860042ac5783cddd368d8997991b0d1f8e9a111:/services/keepstore/usage.go

diff --git a/services/keepstore/usage.go b/services/keepstore/usage.go
index c067ec090b..887cfd3a9e 100644
--- a/services/keepstore/usage.go
+++ b/services/keepstore/usage.go
@@ -4,19 +4,25 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"sort"
+	"strings"
 
 	"github.com/ghodss/yaml"
 )
 
 func usage() {
 	c := DefaultConfig()
+	knownTypes := []string{}
 	for _, vt := range VolumeTypes {
 		c.Volumes = append(c.Volumes, vt().Examples()...)
+		knownTypes = append(knownTypes, vt().Type())
 	}
 	exampleConfigFile, err := yaml.Marshal(c)
 	if err != nil {
 		panic(err)
 	}
+	sort.Strings(knownTypes)
+	knownTypeList := strings.Join(knownTypes, ", ")
 	fmt.Fprintf(os.Stderr, `
 
 keepstore provides a content-addressed data store backed by a local filesystem or networked storage.
@@ -42,6 +48,10 @@ Listen:
     "address" is a host IP address or name and "port" is a port number
     or name.
 
+LogFormat:
+
+    Format of request/response and error logs: "json" or "text".
+
 PIDFile:
 
    Path to write PID file during startup. This file is kept open and
@@ -110,5 +120,9 @@ Volumes:
     use all directories named "keep" that exist in the top level
     directory of a mount point at startup time.
 
-`, exampleConfigFile)
+    Volume types: %s
+
+    (See volume configuration examples above.)
+
+`, exampleConfigFile, knownTypeList)
 }