Add get user resp api endpoint
diff --git a/core/kg/server/http_server.go b/core/kg/server/http_server.go
index dd8151a..932d53b 100644
--- a/core/kg/server/http_server.go
+++ b/core/kg/server/http_server.go
@@ -12,38 +12,37 @@
"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/store"
"github.com/gorilla/mux"
)
// HTTPServerImpl http server implementation
type HTTPServerImpl struct {
- Log common.LoggerIface
srv *http.Server
- routers *rest.Routers
+ routers *rest.Router
config *model.Config
- store store.Store
+ app common.AppIface
+ logger common.LoggerIface
}
var _ Server = &HTTPServerImpl{}
// NewHTTPServer creates new HTTP Server
-func NewHTTPServer(logger common.LoggerIface, config *model.Config, store store.Store) Server {
+func NewHTTPServer(logger common.LoggerIface, config *model.Config, app common.AppIface) Server {
a := &HTTPServerImpl{
- Log: logger,
- routers: rest.NewRouter(mux.NewRouter()),
+ logger: logger,
+ routers: rest.NewRouter(mux.NewRouter(), app, logger),
config: config,
- store: store,
+ app: app,
}
pwd, _ := os.Getwd()
- a.Log.Info("HTTP server current working", log.String("directory", pwd))
+ a.logger.Info("HTTP server current working", log.String("directory", pwd))
return a
}
// Start method starts a http server
func (a *HTTPServerImpl) Start() error {
- a.Log.Info("Starting HTTP Server...")
+ a.logger.Info("Starting HTTP Server...")
a.srv = &http.Server{
Addr: fmt.Sprintf("%s:%d", a.config.HTTP.Host, a.config.HTTP.Port),
@@ -53,9 +52,9 @@
IdleTimeout: time.Duration(a.config.HTTP.IdleTimeout) * time.Second,
}
- a.Log.Info("HTTP Server is listening on", log.Int("port", a.config.HTTP.Port))
+ a.logger.Info("HTTP Server is listening on", log.Int("port", a.config.HTTP.Port))
if err := a.srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
- a.Log.Error("Failed to listen and serve: %v", log.Err(err))
+ a.logger.Error("Failed to listen and serve: %v", log.Err(err))
return err
}
return nil
@@ -63,7 +62,7 @@
// Shutdown method shuts http server down
func (a *HTTPServerImpl) Shutdown() error {
- a.Log.Info("Stopping HTTP Server...")
+ a.logger.Info("Stopping HTTP Server...")
if a.srv == nil {
return errors.New("No http server present")
}
@@ -71,11 +70,11 @@
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
if err := a.srv.Shutdown(ctx); err != nil {
- a.Log.Error("Unable to shutdown server", log.Err(err))
+ a.logger.Error("Unable to shutdown server", log.Err(err))
}
// a.srv.Close()
// a.srv = nil
- a.Log.Info("HTTP Server stopped")
+ a.logger.Info("HTTP Server stopped")
return nil
}