1
0
Fork 0

cmd: add --prefix option to rqlite

If e.g. rqlite is embedded in some other HTTP engine via forwarding or
something, it might not be at /; let's allow the client to talk to rqlite
in this case.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
master
Tycho Andersen 8 years ago
parent ec0922ec62
commit 86bb3c46e5

@ -21,7 +21,7 @@ type executeResponse struct {
} }
func execute(ctx *cli.Context, cmd, line string, argv *argT) error { func execute(ctx *cli.Context, cmd, line string, argv *argT) error {
urlStr := fmt.Sprintf("%s://%s:%d/db/execute?pretty&timings", argv.Protocol, argv.Host, argv.Port) urlStr := fmt.Sprintf("%s://%s:%d%sdb/execute?pretty&timings", argv.Protocol, argv.Host, argv.Port, argv.Prefix)
ret := &executeResponse{} ret := &executeResponse{}
if err := sendRequest(ctx, urlStr, line, ret); err != nil { if err := sendRequest(ctx, urlStr, line, ret); err != nil {
return err return err

@ -18,6 +18,7 @@ type argT struct {
Protocol string `cli:"s,scheme" usage:"protocol scheme (http or https)" dft:"http"` Protocol string `cli:"s,scheme" usage:"protocol scheme (http or https)" dft:"http"`
Host string `cli:"H,host" usage:"rqlited host address" dft:"127.0.0.1"` Host string `cli:"H,host" usage:"rqlited host address" dft:"127.0.0.1"`
Port uint16 `cli:"p,port" usage:"rqlited host port" dft:"4001"` Port uint16 `cli:"p,port" usage:"rqlited host port" dft:"4001"`
Prefix string `cli:"P,prefix" usage:"rqlited HTTP prefix" dft:"/"`
} }
func main() { func main() {

@ -80,7 +80,7 @@ type queryResponse struct {
} }
func query(ctx *cli.Context, cmd, line string, argv *argT) error { func query(ctx *cli.Context, cmd, line string, argv *argT) error {
urlStr := fmt.Sprintf("%s://%s:%d/db/query?timings", argv.Protocol, argv.Host, argv.Port) urlStr := fmt.Sprintf("%s://%s:%d%sdb/query?timings", argv.Protocol, argv.Host, argv.Port, argv.Prefix)
ret := &queryResponse{} ret := &queryResponse{}
if err := sendRequest(ctx, urlStr, line, ret); err != nil { if err := sendRequest(ctx, urlStr, line, ret); err != nil {
return err return err

Loading…
Cancel
Save