char
/
dendrite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update vendor libraries and dendrite to s/Sirupsen/sirupsen/ (#304)

main
Erik Johnston 2017-10-13 14:42:57 +01:00 committed by GitHub
parent d66244cb0a
commit 464fb5de1c
39 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/github.com/matrix-org/dendrite/clientapi/consumers/roomserver.go
View File

@ -24,7 +24,7 @@ import (
"github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/gomatrixserverlib"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
sarama "gopkg.in/Shopify/sarama.v1"
)

2
src/github.com/matrix-org/dendrite/clientapi/routing/createroom.go
View File

@ -23,7 +23,7 @@ import (
"github.com/matrix-org/dendrite/roomserver/api"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/clientapi/httputil"

2
src/github.com/matrix-org/dendrite/clientapi/routing/register.go
View File

@ -28,7 +28,7 @@ import (
"github.com/matrix-org/dendrite/common/config"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/clientapi/auth"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"

2
src/github.com/matrix-org/dendrite/cmd/client-api-proxy/main.go
View File

@ -17,7 +17,7 @@ package main
import (
"flag"
"fmt"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"net/http"
"net/http/httputil"
"net/url"

2
src/github.com/matrix-org/dendrite/cmd/dendrite-client-api-server/main.go
View File

@ -32,7 +32,7 @@ import (
"github.com/matrix-org/gomatrixserverlib"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
sarama "gopkg.in/Shopify/sarama.v1"
)

2
src/github.com/matrix-org/dendrite/cmd/dendrite-federation-api-server/main.go
View File

@ -29,7 +29,7 @@ import (
"github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/gomatrixserverlib"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
var (

2
src/github.com/matrix-org/dendrite/cmd/dendrite-federation-sender-server/main.go
View File

@ -28,7 +28,7 @@ import (
"github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/gomatrixserverlib"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
sarama "gopkg.in/Shopify/sarama.v1"
)

2
src/github.com/matrix-org/dendrite/cmd/dendrite-media-api-server/main.go
View File

@ -27,7 +27,7 @@ import (
"github.com/matrix-org/dendrite/mediaapi/storage"
"github.com/matrix-org/gomatrixserverlib"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
var (

2
src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go
View File

@ -57,7 +57,7 @@ import (
publicroomsapi_routing "github.com/matrix-org/dendrite/publicroomsapi/routing"
publicroomsapi_storage "github.com/matrix-org/dendrite/publicroomsapi/storage"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
sarama "gopkg.in/Shopify/sarama.v1"
)

2
src/github.com/matrix-org/dendrite/cmd/dendrite-public-rooms-api-server/main.go
View File

@ -28,7 +28,7 @@ import (
"github.com/matrix-org/dendrite/publicroomsapi/storage"
"github.com/matrix-org/dendrite/roomserver/api"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
sarama "gopkg.in/Shopify/sarama.v1"
)

2
src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go
View File

@ -20,7 +20,7 @@ import (
_ "net/http/pprof"
"os"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/roomserver/alias"

2
src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go
View File

@ -32,7 +32,7 @@ import (
"github.com/matrix-org/dendrite/syncapi/sync"
"github.com/matrix-org/dendrite/syncapi/types"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
sarama "gopkg.in/Shopify/sarama.v1"
)

2
src/github.com/matrix-org/dendrite/cmd/federation-api-proxy/main.go
View File

@ -17,7 +17,7 @@ package main
import (
"flag"
"fmt"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"net/http"
"net/http/httputil"
"net/url"

2
src/github.com/matrix-org/dendrite/common/config/config.go
View File

@ -25,7 +25,7 @@ import (
"strings"
"time"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/matrix-org/gomatrixserverlib"
"golang.org/x/crypto/ed25519"
"gopkg.in/yaml.v2"

2
src/github.com/matrix-org/dendrite/common/log.go
View File

@ -18,7 +18,7 @@ import (
"os"
"path/filepath"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/matrix-org/dugong"
)

2
src/github.com/matrix-org/dendrite/federationapi/routing/threepid.go
View File

@ -33,7 +33,7 @@ import (
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
)
type invite struct {

2
src/github.com/matrix-org/dendrite/federationsender/consumers/roomserver.go
View File

@ -19,7 +19,7 @@ import (
"encoding/json"
"fmt"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/federationsender/queue"

2
src/github.com/matrix-org/dendrite/federationsender/queue/destinationqueue.go
View File

@ -20,7 +20,7 @@ import (
"sync"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/gomatrixserverlib"
)

2
src/github.com/matrix-org/dendrite/federationsender/queue/queue.go
View File

@ -18,7 +18,7 @@ import (
"fmt"
"sync"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/gomatrixserverlib"
)

2
src/github.com/matrix-org/dendrite/mediaapi/fileutils/fileutils.go
View File

@ -25,7 +25,7 @@ import (
"path/filepath"
"strings"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/mediaapi/types"
)

2
src/github.com/matrix-org/dendrite/mediaapi/routing/download.go
View File

@ -28,7 +28,7 @@ import (
"strings"
"sync"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/mediaapi/fileutils"

2
src/github.com/matrix-org/dendrite/mediaapi/routing/upload.go
View File

@ -22,7 +22,7 @@ import (
"net/url"
"path"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/mediaapi/fileutils"

2
src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer.go
View File

@ -22,7 +22,7 @@ import (
"path/filepath"
"sync"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/mediaapi/storage"
"github.com/matrix-org/dendrite/mediaapi/types"

2
src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer_bimg.go
View File

@ -21,7 +21,7 @@ import (
"os"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/mediaapi/storage"
"github.com/matrix-org/dendrite/mediaapi/types"

2
src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer_nfnt.go
View File

@ -28,7 +28,7 @@ import (
"os"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/mediaapi/storage"
"github.com/matrix-org/dendrite/mediaapi/types"

2
src/github.com/matrix-org/dendrite/publicroomsapi/consumers/roomserver.go
View File

@ -18,7 +18,7 @@ import (
"context"
"encoding/json"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/publicroomsapi/storage"

2
src/github.com/matrix-org/dendrite/syncapi/consumers/clientapi.go
View File

@ -18,7 +18,7 @@ import (
"context"
"encoding/json"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/syncapi/storage"

2
src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go
View File

@ -19,7 +19,7 @@ import (
"encoding/json"
"fmt"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/roomserver/api"

2
src/github.com/matrix-org/dendrite/syncapi/storage/output_room_events_table.go
View File

@ -18,7 +18,7 @@ import (
"context"
"database/sql"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/lib/pq"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/syncapi/types"

2
src/github.com/matrix-org/dendrite/syncapi/sync/notifier.go
View File

@ -18,7 +18,7 @@ import (
"context"
"sync"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/syncapi/storage"
"github.com/matrix-org/dendrite/syncapi/types"
"github.com/matrix-org/gomatrixserverlib"

2
src/github.com/matrix-org/dendrite/syncapi/sync/request.go
View File

@ -20,7 +20,7 @@ import (
"strconv"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/syncapi/types"
"github.com/matrix-org/util"
)

2
src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go
View File

@ -19,7 +19,7 @@ import (
"net/http"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/clientapi/httputil"

4
vendor/manifest vendored
View File

@ -129,7 +129,7 @@
{
"importpath": "github.com/matrix-org/dugong",
"repository": "https://github.com/matrix-org/dugong",
"revision": "193b8f88e381d12f2d53023fba25e43fc81dc5ac",
"revision": "f04553160a2b197248e032f4fe23d57b9af20cde",
"branch": "master"
},
{
@ -153,7 +153,7 @@
{
"importpath": "github.com/matrix-org/util",
"repository": "https://github.com/matrix-org/util",
"revision": "cf7e2e3871b7ae39106a1763312deaaf0c139531",
"revision": "8b1c8ab81986c1ce7f06a52fce48f4a1156b66ee",
"branch": "master"
},
{

4
vendor/src/github.com/matrix-org/dugong/README.md vendored
View File

@ -3,8 +3,8 @@ Logging utilities for [logrus](https://github.com/Sirupsen/logrus).
To develop on this library, you need logrus on your GOPATH:
``go get github.com/Sirupsen/logrus``
``go get github.com/sirupsen/logrus``
You can then run its tests by running
``go test``

2
vendor/src/github.com/matrix-org/dugong/fshook.go vendored
View File

@ -3,7 +3,7 @@ package dugong
import (
"compress/gzip"
"fmt"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"io"
"os"
"path/filepath"

2
vendor/src/github.com/matrix-org/dugong/fshook_test.go vendored
View File

@ -3,7 +3,7 @@ package dugong
import (
"bufio"
"encoding/json"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"io/ioutil"
"os"
"path/filepath"

2
vendor/src/github.com/matrix-org/util/context.go vendored
View File

@ -3,7 +3,7 @@ package util
import (
"context"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// contextKeys is a type alias for string to namespace Context keys per-package.

2
vendor/src/github.com/matrix-org/util/json.go vendored
View File

@ -8,7 +8,7 @@ import (
"runtime/debug"
"time"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// JSONResponse represents an HTTP response which contains a JSON body.

2
vendor/src/github.com/matrix-org/util/json_test.go vendored
View File

@ -7,7 +7,7 @@ import (
"net/http/httptest"
"testing"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
type MockJSONRequestHandler struct {