separated httpcli from replaycli. Added config methods
This commit is contained in:
+14
-18
@@ -10,11 +10,7 @@ import (
|
||||
)
|
||||
|
||||
type Cli struct {
|
||||
cli *api.Cli
|
||||
}
|
||||
|
||||
func (c *Cli) HttpCli() *api.Cli {
|
||||
return c.cli
|
||||
*api.ApiCli
|
||||
}
|
||||
|
||||
func (c *Cli) ReplayEnvQueueId() string {
|
||||
@@ -55,56 +51,56 @@ func (c *Cli) ReplayEnvApiKey() string {
|
||||
}
|
||||
|
||||
func (c *Cli) OpenApp(id uint) error {
|
||||
err := c.cli.HttpJsonGet(fmt.Sprintf("/api/v1/app/run/%d", id), nil)
|
||||
err := c.HttpCli().JsonGet(fmt.Sprintf("/api/v1/app/run/%d", id), nil)
|
||||
return err
|
||||
}
|
||||
|
||||
func (c *Cli) ConfigGet(k string) (ret string, err error) {
|
||||
err = c.cli.HttpJsonGet("/api/v1/config/byrepo/"+util.Repo()+"/"+k, &ret)
|
||||
err = c.HttpCli().JsonGet("/api/v1/config/byrepo/"+util.Repo()+"/"+k, &ret)
|
||||
return
|
||||
}
|
||||
|
||||
func (c *Cli) ConfigGetAll() (ret []types.Config, err error) {
|
||||
ret = make([]types.Config, 0)
|
||||
err = c.cli.HttpJsonGet("/api/v1/config/byrepo/"+util.Repo(), &ret)
|
||||
err = c.HttpCli().JsonGet("/api/v1/config/byrepo/"+util.Repo(), &ret)
|
||||
return
|
||||
}
|
||||
|
||||
func (c *Cli) CronReload() error {
|
||||
return c.cli.HttpJsonGet("/ipc/cron/reload", nil)
|
||||
return c.HttpCli().JsonGet("/ipc/cron/reload", nil)
|
||||
}
|
||||
|
||||
func (c *Cli) Exit() error {
|
||||
err := c.cli.HttpJsonGet("/api/v1/exit", nil)
|
||||
err := c.HttpCli().JsonGet("/api/v1/exit", nil)
|
||||
return err
|
||||
}
|
||||
|
||||
func (c *Cli) MenuGetAllEnabled() (ret []types.Menu, err error) {
|
||||
ret = make([]types.Menu, 0)
|
||||
err = c.cli.HttpJsonGet("/api/v1/menu/enabled", nil)
|
||||
err = c.HttpCli().JsonGet("/api/v1/menu/enabled", nil)
|
||||
return ret, err
|
||||
}
|
||||
|
||||
func (c *Cli) QueueAdd(job string, bs []byte) error {
|
||||
_, err := c.cli.HttpRawPost("/api/v1/queue/add/"+job, bs)
|
||||
_, err := c.HttpCli().RawPost("/api/v1/queue/add/"+job, bs)
|
||||
return err
|
||||
}
|
||||
func (c *Cli) QueueGetData(id string) (ret []byte, err error) {
|
||||
ret, err = c.cli.HttpRawGet("/api/v1/queue/getrequest/" + id)
|
||||
ret, err = c.HttpCli().RawGet("/api/v1/queue/getrequest/" + id)
|
||||
return
|
||||
}
|
||||
func (c *Cli) QueueGetMyData() ([]byte, error) {
|
||||
return c.QueueGetData(os.Getenv("REPLAY_QUEUEID"))
|
||||
}
|
||||
func (c *Cli) QueueAbort() error {
|
||||
return c.cli.HttpJsonGet("/api/v1/queue/abort", nil)
|
||||
return c.HttpCli().JsonGet("/api/v1/queue/abort", nil)
|
||||
}
|
||||
func (c *Cli) QueueEnqueue(id uint) error {
|
||||
return c.cli.HttpJsonGet(fmt.Sprintf("/api/v1/robots/op/enqueue/%d", id), nil)
|
||||
return c.HttpCli().JsonGet(fmt.Sprintf("/api/v1/robots/op/enqueue/%d", id), nil)
|
||||
}
|
||||
|
||||
func (c *Cli) ServiceStopAll() error {
|
||||
return c.cli.HttpJsonGet("/api/v1/service/op/stopall", nil)
|
||||
return c.HttpCli().JsonGet("/api/v1/service/op/stopall", nil)
|
||||
}
|
||||
|
||||
type SQLReturn struct {
|
||||
@@ -117,11 +113,11 @@ func (c *Cli) SQL(s string) (*SQLReturn, error) {
|
||||
Sql string `json:"sql"`
|
||||
}{s}
|
||||
out := &SQLReturn{}
|
||||
err := c.cli.HttpJsonPost("/api/v1/sql", in, &out)
|
||||
err := c.HttpCli().JsonPost("/api/v1/sql", in, &out)
|
||||
return out, err
|
||||
}
|
||||
|
||||
func NewCli() *Cli {
|
||||
ret := &Cli{cli: api.NewCli()}
|
||||
ret := &Cli{ApiCli: api.NewApiCli()}
|
||||
return ret
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user