move log package to /infra (#17023)

ref #14679

Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
This commit is contained in:
zhulongcheng
2019-05-13 08:45:54 +02:00
committed by Carl Bergquist
parent 0efb8821f9
commit 2fff8f77dc
127 changed files with 118 additions and 118 deletions
@@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
yaml "gopkg.in/yaml.v2"
)
@@ -4,7 +4,7 @@ import (
"os"
"testing"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
. "github.com/smartystreets/goconvey/convey"
)
@@ -3,7 +3,7 @@ package dashboards
import (
"context"
"fmt"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/pkg/errors"
)
@@ -16,7 +16,7 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
)
@@ -6,7 +6,7 @@ import (
"path/filepath"
"testing"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
)
var (
@@ -13,7 +13,7 @@ import (
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
. "github.com/smartystreets/goconvey/convey"
)
@@ -6,7 +6,7 @@ import (
"path/filepath"
"strings"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
"gopkg.in/yaml.v2"
)
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
. "github.com/smartystreets/goconvey/convey"
@@ -5,7 +5,7 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
)
@@ -2,7 +2,7 @@ package datasources
import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/provisioning/values"
)
@@ -4,7 +4,7 @@ import (
"errors"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
)
@@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting"
"gopkg.in/yaml.v2"
@@ -4,7 +4,7 @@ import (
"os"
"testing"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/services/alerting/notifiers"
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"path"
"sync"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/pkg/errors"
"github.com/grafana/grafana/pkg/registry"