More review fixes. (google#313)

trillian/ctfe/configpb/config.proto

@@ -51,7 +51,7 @@ message LogConfig {
   // which is common for both types.
   int64 log_id = 1;
   // prefix is the name of the log. It will come after the global or
-  // custom handler prefix. For example if the handler prefix is "/logs"
+  // override handler prefix. For example if the handler prefix is "/logs"
   // and prefix is "vogon" the get-sth handler for this log will be
   // available at "/logs/vogon/ct/v1/get-sth". The prefix cannot be empty
   // and must not include "/" path separator characters.

trillian/ctfe/ct_server/main.go

@@ -173,7 +173,7 @@ func main() {
 	// Register handlers for all the configured logs using the correct RPC
 	// client.
 	for _, c := range cfg.LogConfigs.Config {
-		if err := setupAndRegister(ctx, clientMap[c.LogBackendName], *rpcDeadline, c, corsMux); err != nil {
+		if err := setupAndRegister(ctx, clientMap[c.LogBackendName], *rpcDeadline, c, corsMux, *handlerPrefix); err != nil {
 			glog.Exitf("Failed to set up log instance for %+v: %v", cfg, err)
 		}
 	}
@@ -270,7 +270,7 @@ func awaitSignal(doneFn func()) {
 	doneFn()
 }
 
-func setupAndRegister(ctx context.Context, client trillian.TrillianLogClient, deadline time.Duration, cfg *configpb.LogConfig, mux *http.ServeMux) error {
+func setupAndRegister(ctx context.Context, client trillian.TrillianLogClient, deadline time.Duration, cfg *configpb.LogConfig, mux *http.ServeMux, globalHandlerPrefix string) error {
 	if cfg.IsMirror {
 		return errors.New("mirrors are not supported")
 	}
@@ -297,7 +297,7 @@ func setupAndRegister(ctx context.Context, client trillian.TrillianLogClient, de
 	// have an existing URL path that differs from the global one. For example
 	// if all new logs are served on "/logs/log/..." and a previously existing
 	// log is at "/log/..." this is now supported.
-	lhp := *handlerPrefix
+	lhp := globalHandlerPrefix
 	if len(opts.Config.OverrideHandlerPrefix) > 0 {
 		glog.Infof("Log with prefix: %s is using a custom HandlerPrefix: %s", opts.Config.Prefix, opts.Config.OverrideHandlerPrefix)
 		lhp = "/" + strings.Trim(opts.Config.OverrideHandlerPrefix, "/")