use flags from options instead of config
This commit is contained in:
@@ -1,9 +1,7 @@
|
|||||||
package http
|
package http
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/owncloud/ocis-konnectd/pkg/config"
|
svc "github.com/owncloud/ocis-konnectd/pkg/service/v0"
|
||||||
"github.com/owncloud/ocis-konnectd/pkg/flagset"
|
|
||||||
"github.com/owncloud/ocis-konnectd/pkg/service/v0"
|
|
||||||
"github.com/owncloud/ocis-konnectd/pkg/version"
|
"github.com/owncloud/ocis-konnectd/pkg/version"
|
||||||
"github.com/owncloud/ocis-pkg/middleware"
|
"github.com/owncloud/ocis-pkg/middleware"
|
||||||
"github.com/owncloud/ocis-pkg/service/http"
|
"github.com/owncloud/ocis-pkg/service/http"
|
||||||
@@ -20,8 +18,7 @@ func Server(opts ...Option) (http.Service, error) {
|
|||||||
http.Version(version.String),
|
http.Version(version.String),
|
||||||
http.Address(options.Config.HTTP.Addr),
|
http.Address(options.Config.HTTP.Addr),
|
||||||
http.Context(options.Context),
|
http.Context(options.Context),
|
||||||
http.Flags(flagset.RootWithConfig(config.New())...),
|
http.Flags(options.Flags...),
|
||||||
http.Flags(flagset.ServerWithConfig(config.New())...),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
handle := svc.NewService(
|
handle := svc.NewService(
|
||||||
|
|||||||
Reference in New Issue
Block a user