Add rest router
diff --git a/core/kg/server/grpc_server.go b/core/kg/server/grpc_server.go
index 20aed55..af0b945 100644
--- a/core/kg/server/grpc_server.go
+++ b/core/kg/server/grpc_server.go
@@ -5,11 +5,11 @@
"net"
"os"
+ "github.com/giolekva/pcloud/core/kg/api/rpc"
"github.com/giolekva/pcloud/core/kg/common"
"github.com/giolekva/pcloud/core/kg/log"
"github.com/giolekva/pcloud/core/kg/model"
"github.com/giolekva/pcloud/core/kg/model/proto"
- "github.com/giolekva/pcloud/core/kg/rpc"
"google.golang.org/grpc"
)
diff --git a/core/kg/server/http_server.go b/core/kg/server/http_server.go
index 6b07914..dd8151a 100644
--- a/core/kg/server/http_server.go
+++ b/core/kg/server/http_server.go
@@ -8,6 +8,7 @@
"os"
"time"
+ "github.com/giolekva/pcloud/core/kg/api/rest"
"github.com/giolekva/pcloud/core/kg/common"
"github.com/giolekva/pcloud/core/kg/log"
"github.com/giolekva/pcloud/core/kg/model"
@@ -17,11 +18,11 @@
// HTTPServerImpl http server implementation
type HTTPServerImpl struct {
- Log common.LoggerIface
- srv *http.Server
- root *mux.Router
- config *model.Config
- store store.Store
+ Log common.LoggerIface
+ srv *http.Server
+ routers *rest.Routers
+ config *model.Config
+ store store.Store
}
var _ Server = &HTTPServerImpl{}
@@ -29,10 +30,10 @@
// NewHTTPServer creates new HTTP Server
func NewHTTPServer(logger common.LoggerIface, config *model.Config, store store.Store) Server {
a := &HTTPServerImpl{
- Log: logger,
- root: mux.NewRouter(),
- config: config,
- store: store,
+ Log: logger,
+ routers: rest.NewRouter(mux.NewRouter()),
+ config: config,
+ store: store,
}
pwd, _ := os.Getwd()
@@ -46,7 +47,7 @@
a.srv = &http.Server{
Addr: fmt.Sprintf("%s:%d", a.config.HTTP.Host, a.config.HTTP.Port),
- Handler: a.root,
+ Handler: a.routers.Root,
ReadTimeout: time.Duration(a.config.HTTP.ReadTimeout) * time.Second,
WriteTimeout: time.Duration(a.config.HTTP.WriteTimeout) * time.Second,
IdleTimeout: time.Duration(a.config.HTTP.IdleTimeout) * time.Second,