cloudapi: use Logrus as default logger in Echo
And remove log.Logger references
This commit is contained in:
parent
75372b98e1
commit
179009fec4
9 changed files with 198 additions and 15 deletions
|
|
@ -1,15 +1,14 @@
|
|||
package cloudapi
|
||||
|
||||
import (
|
||||
"log"
|
||||
"net/http"
|
||||
|
||||
"github.com/osbuild/osbuild-composer/internal/distroregistry"
|
||||
"github.com/osbuild/osbuild-composer/internal/rpmmd"
|
||||
"github.com/osbuild/osbuild-composer/internal/worker"
|
||||
|
||||
"github.com/osbuild/osbuild-composer/internal/cloudapi/v1"
|
||||
"github.com/osbuild/osbuild-composer/internal/cloudapi/v2"
|
||||
v1 "github.com/osbuild/osbuild-composer/internal/cloudapi/v1"
|
||||
v2 "github.com/osbuild/osbuild-composer/internal/cloudapi/v2"
|
||||
)
|
||||
|
||||
type Server struct {
|
||||
|
|
@ -17,10 +16,10 @@ type Server struct {
|
|||
v2 *v2.Server
|
||||
}
|
||||
|
||||
func NewServer(logger *log.Logger, workers *worker.Server, rpmMetadata rpmmd.RPMMD, distros *distroregistry.Registry) *Server {
|
||||
func NewServer(workers *worker.Server, rpmMetadata rpmmd.RPMMD, distros *distroregistry.Registry) *Server {
|
||||
server := &Server{
|
||||
v1: v1.NewServer(workers, rpmMetadata, distros),
|
||||
v2: v2.NewServer(logger, workers, rpmMetadata, distros),
|
||||
v2: v2.NewServer(workers, rpmMetadata, distros),
|
||||
}
|
||||
return server
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue