Browse Source

Merge remote-tracking branch 'refs/remotes/origin/master'

master
Benjamin Shelton 4 weeks ago
parent
commit
7eb8b136ab
4 changed files with 25 additions and 17 deletions
  1. +2
    -3
      go.mod
  2. +17
    -10
      go.sum
  3. +1
    -1
      server/routes.go
  4. +5
    -3
      server/server.go

+ 2
- 3
go.mod View File

@ -7,9 +7,8 @@ require (
git.destrealm.org/go/errors v0.0.0-20200302092551-6013d9db96e6
git.destrealm.org/go/fileutils v0.0.0-20200224031645-b70c9692d5a6
git.destrealm.org/go/logging v0.0.0-20200424215645-c5512a1ad2ab
git.destrealm.org/go/please v0.0.0-20200626070559-16200e770e00
git.destrealm.org/go/signals v0.0.0-20200224010432-0d3ad2920b96
github.com/etcd-io/bbolt v1.3.2 // indirect
git.destrealm.org/go/please v0.0.0-20210125224741-45bbbcadf301
git.destrealm.org/go/signals v0.0.0-20210125220034-708aa2462270
github.com/go-chi/chi v4.0.2+incompatible
github.com/joho/godotenv v1.3.0
github.com/urfave/cli v1.22.1


+ 17
- 10
go.sum View File

@ -1,18 +1,23 @@
git.destrealm.org/go/capstan v0.0.0-20200224064441-af22fa72efe8 h1:weg49Z2UqKg6IqjnPc78845YpVA5slrGJJwAgwXr4jk=
git.destrealm.org/go/capstan v0.0.0-20200224064441-af22fa72efe8/go.mod h1:xi/rtUckfdcOlKQ8WYHPvVJDOo84UcA8joNfmSu5pWg=
git.destrealm.org/go/errors v0.0.0-20200222072452-ca11c73fd578 h1:ousQ/MJ1bCV8VyLdbYmuYWf42PTfp1wcThxDG0d/BT4=
git.destrealm.org/go/capstan v0.0.0-20210130213510-78a7158959dd h1:AThx3xtO0LjgehIabU94XhjuiajUIXgmOlMDnhXFb/Q=
git.destrealm.org/go/capstan v0.0.0-20210130213510-78a7158959dd/go.mod h1:uXNgaf9CBtNaX1o4UwcfXV0uPuR6LnAVAc7HW+LGNOo=
git.destrealm.org/go/cryptohelper v0.0.0-20200804054133-1fc32d3d77ed h1:cfp5p3Nm4eCW8faX9aNlg5W3rfPfLaGqrPEtP6AN+v0=
git.destrealm.org/go/cryptohelper v0.0.0-20200804054133-1fc32d3d77ed/go.mod h1:ATn5Jsx66Y9TGOv5MY7A2PheoqWrfet4idbyGCNQZJw=
git.destrealm.org/go/errors v0.0.0-20200222072452-ca11c73fd578/go.mod h1:N1uueACwvr+xQQl1Ago1vkE+6oaIT0I2sBG6fpiQ53I=
git.destrealm.org/go/errors v0.0.0-20200302092551-6013d9db96e6 h1:3+LG4VFMRdEWs7IAsi+rHeWLZzalSS6xtfXYkmyD8Cc=
git.destrealm.org/go/errors v0.0.0-20200302092551-6013d9db96e6/go.mod h1:N1uueACwvr+xQQl1Ago1vkE+6oaIT0I2sBG6fpiQ53I=
git.destrealm.org/go/fileutils v0.0.0-20200224031645-b70c9692d5a6 h1:CykWSPVCM3q1gcI6AckMKh8qkzxXRd5WBxH2/jDMEPE=
git.destrealm.org/go/fileutils v0.0.0-20200224031645-b70c9692d5a6/go.mod h1:ng/e8uHcdh+mBdOKEdWE71u5eofFwA20etT++zwdmio=
git.destrealm.org/go/logging v0.0.0-20200222072222-24b01426c1a8 h1:yNkOhmSNhsG0geo3e3h9B6nrxZWcA+fgmke3LLJ5si8=
git.destrealm.org/go/logging v0.0.0-20200222072222-24b01426c1a8/go.mod h1:OYZiOPWORBpswaZfqM4n/UDsGaEcpkq02OJCq/xbyG0=
git.destrealm.org/go/please v0.0.0-20200223224415-236b7da10a9d h1:f54A4FEnxW/zTE9WGjQYV68Luy0gw0Z5IbGLxN+rX7w=
git.destrealm.org/go/please v0.0.0-20200223224415-236b7da10a9d/go.mod h1:uQJAtNTNgE665zsoo98DRKHtPwoXmvZO2XSHWtmH2Zk=
git.destrealm.org/go/keystar v0.0.0-20201020190417-5730583a3c58/go.mod h1:Geyj/7NsyWwZb96KGtph3OkIdFx0r1Y/0IBCF9IFwlA=
git.destrealm.org/go/logging v0.0.0-20200424215645-c5512a1ad2ab h1:YySUkhQJ4+nej4e5ZVLVzUUXjOHXG6Um2+br4KgKpVM=
git.destrealm.org/go/logging v0.0.0-20200424215645-c5512a1ad2ab/go.mod h1:OYZiOPWORBpswaZfqM4n/UDsGaEcpkq02OJCq/xbyG0=
git.destrealm.org/go/please v0.0.0-20210125224741-45bbbcadf301 h1:++2OhEqBsVBYAZYlH/eO1Lx2pTw2DVnuSrBXhrAzwnI=
git.destrealm.org/go/please v0.0.0-20210125224741-45bbbcadf301/go.mod h1:RvOA1xnWXuW3w3jsmrKLsAYVa0jCH7e9s48hwBzO/jo=
git.destrealm.org/go/principal v0.0.0-20200224041819-3fed3f04bb99/go.mod h1:wvO+xMR6ngKDyvbyk+W3rykTMxhxM2JFhdbcyZen0AI=
git.destrealm.org/go/signals v0.0.0-20200224010432-0d3ad2920b96 h1:ugp8fab1OsUCYXfZOs3ZIbZvAUumgRm3wHWCYnY8Uqs=
git.destrealm.org/go/signals v0.0.0-20200224010432-0d3ad2920b96/go.mod h1:WzvLS3dLz6e+XTyLhgV82IGvkU8n12K45kGe65nSWcU=
git.destrealm.org/go/vfs v0.0.0-20200223233237-d420c1f5ac52 h1:FWHU8e4hccmFWfKPJi3HN6q05gR+Dpg+zBUD3FK8xb8=
git.destrealm.org/go/signals/v2 v2.0.0-20210128074252-8238a25ea299 h1:wua8YHaGowO1x+5aGTPdt4xbny7WvfRftUAswakSLeA=
git.destrealm.org/go/signals/v2 v2.0.0-20210128074252-8238a25ea299/go.mod h1:sr/FUucf/fpKEWuR2riA/Pfg5S3THGy24KnEtVSw2ds=
git.destrealm.org/go/vfs v0.0.0-20200223233237-d420c1f5ac52/go.mod h1:34k1SP72AAsR1oIDWb2MBmjScV6CS23zy7sFKR2/0YE=
git.destrealm.org/go/vfs v0.0.0-20201020041122-876147b3dc2b h1:pLSdAbDxMXREW/zF3ulR/FRhxHp0uoG4MGiV4KXaVjU=
git.destrealm.org/go/vfs v0.0.0-20201020041122-876147b3dc2b/go.mod h1:34k1SP72AAsR1oIDWb2MBmjScV6CS23zy7sFKR2/0YE=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
@ -65,6 +70,8 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 h1:Gv7RPwsi3eZ2Fgewe3CBsuOebPwO27PoXzRpJPsvSSM=
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=


+ 1
- 1
server/routes.go View File

@ -65,7 +65,7 @@ func routes(ks *keystar.KeyStar) *chi.Mux {
return r
}
func keyAPIRoutes(app *capstan.Application, ks *keystar.KeyStar) {
func keyAPIRoutes(app capstan.Application, ks *keystar.KeyStar) {
binder := app.BindGroup("/api/v1").Name("api")
binder.Options().ContentType = "application/json"
binder.Add(func(router *capstan.Router) {


+ 5
- 3
server/server.go View File

@ -167,9 +167,11 @@ func (s *Server) Configure() error {
}
func (s *Server) Handler() http.Handler {
app := capstan.New(&capstan.ServerConfig{
RequestLog: "keystar-server",
//LogLevel: logging.Debug,
app := capstan.New(&capstan.Config{
Server: &capstan.ServerConfig{
RequestLog: "keystar-server",
//LogLevel: logging.Debug,
},
})
app.Dependencies().Register("server", logging.MustGetLogger("keystar-server"))
app.Dependencies().Register("keyspace", s.ks)


Loading…
Cancel
Save