sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phoenix working

Browse Source
This commit is contained in:
A.Unger
2020-09-18 15:05:53 +02:00
parent b23ea8f21b
commit c192fca74f
12 changed files with 66 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ocis-phoenix/pkg/assets/assets.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"path"
"github.com/owncloud/ocis/ocis-phoenix/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
//go:generate go run github.com/UnnoTed/fileb0x embed.yml
ocis-phoenix/pkg/assets/option.go
+1 -1
View File
@@ -2,7 +2,7 @@ package assets
import (
"github.com/owncloud/ocis/ocis-phoenix/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.
ocis-phoenix/pkg/command/root.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/owncloud/ocis/ocis-phoenix/pkg/config"
"github.com/owncloud/ocis/ocis-phoenix/pkg/flagset"
"github.com/owncloud/ocis/ocis-phoenix/pkg/version"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/spf13/viper"
)
ocis-phoenix/pkg/server/debug/option.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"github.com/owncloud/ocis/ocis-phoenix/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.
ocis-phoenix/pkg/server/debug/server.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/owncloud/ocis/ocis-phoenix/pkg/config"
"github.com/owncloud/ocis/ocis-phoenix/pkg/version"
"github.com/owncloud/ocis-pkg/v2/service/debug"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
)
// Server initializes the debug service and server.
ocis-phoenix/pkg/server/http/option.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-phoenix/pkg/config"
"github.com/owncloud/ocis/ocis-phoenix/pkg/metrics"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.
ocis-phoenix/pkg/server/http/server.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
phoenixmid "github.com/owncloud/ocis/ocis-phoenix/pkg/middleware"
svc "github.com/owncloud/ocis/ocis-phoenix/pkg/service/v0"
"github.com/owncloud/ocis/ocis-phoenix/pkg/version"
"github.com/owncloud/ocis-pkg/v2/middleware"
"github.com/owncloud/ocis-pkg/v2/service/http"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
)
// Server initializes the http service and server.
ocis-phoenix/pkg/service/v0/logging.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// NewLogging returns a service that logs messages.
ocis-phoenix/pkg/service/v0/option.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"net/http"
"github.com/owncloud/ocis/ocis-phoenix/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.
ocis-phoenix/pkg/service/v0/service.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/go-chi/chi"
"github.com/owncloud/ocis/ocis-phoenix/pkg/assets"
"github.com/owncloud/ocis/ocis-phoenix/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
var (