Skip to content

Commit 5104b6b

Browse files
yaskeryasker
committed
Update Sirupsen to sirupsen
sirupsen/logrus#553
1 parent 3a7e8be commit 5104b6b

File tree

143 files changed

+9550
-1236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+9550
-1236
lines changed

‎app/add_replica.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package app
33
import (
44
"errors"
55

6-
"github.com/Sirupsen/logrus"
7-
"github.com/rancher/longhorn-engine/sync"
6+
"github.com/sirupsen/logrus"
87
"github.com/urfave/cli"
8+
9+
"github.com/rancher/longhorn-engine/sync"
910
)
1011

1112
func AddReplicaCmd() cli.Command {

‎app/backup.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"os"
66

7-
"github.com/Sirupsen/logrus"
87
"github.com/pkg/errors"
8+
"github.com/sirupsen/logrus"
99
"github.com/urfave/cli"
1010

1111
"github.com/rancher/backupstore/cmd"

‎app/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"net/http"
88
"os"
99

10-
"github.com/Sirupsen/logrus"
1110
"github.com/gorilla/handlers"
11+
"github.com/sirupsen/logrus"
1212
"github.com/urfave/cli"
1313

1414
"github.com/rancher/longhorn-engine/backend/dynamic"

‎app/ls_replica.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import (
55
"os"
66
"text/tabwriter"
77

8-
"github.com/Sirupsen/logrus"
8+
"github.com/sirupsen/logrus"
9+
"github.com/urfave/cli"
10+
911
"github.com/rancher/longhorn-engine/controller/client"
1012
replicaClient "github.com/rancher/longhorn-engine/replica/client"
11-
"github.com/urfave/cli"
1213
)
1314

1415
func LsReplicaCmd() cli.Command {

‎app/replica.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ import (
88
"path/filepath"
99
"syscall"
1010

11-
"github.com/Sirupsen/logrus"
1211
"github.com/docker/go-units"
12+
"github.com/sirupsen/logrus"
13+
"github.com/urfave/cli"
14+
1315
"github.com/rancher/longhorn-engine/replica"
1416
"github.com/rancher/longhorn-engine/replica/rest"
1517
"github.com/rancher/longhorn-engine/replica/rpc"
1618
"github.com/rancher/longhorn-engine/util"
17-
"github.com/urfave/cli"
1819
)
1920

2021
func ReplicaCmd() cli.Command {

‎app/rm_replica.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package app
33
import (
44
"errors"
55

6-
"github.com/Sirupsen/logrus"
6+
"github.com/sirupsen/logrus"
77
"github.com/urfave/cli"
88
)
99

‎app/snapshot.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strings"
88
"text/tabwriter"
99

10-
"github.com/Sirupsen/logrus"
1110
"github.com/pkg/errors"
11+
"github.com/sirupsen/logrus"
1212
"github.com/urfave/cli"
1313

1414
"github.com/rancher/longhorn-engine/sync"

‎app/stats.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package app
22

33
import (
4-
"github.com/Sirupsen/logrus"
4+
"github.com/sirupsen/logrus"
55
"github.com/urfave/cli"
66
)
77

‎app/sync_agent.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import (
66
"strconv"
77
"strings"
88

9-
"github.com/Sirupsen/logrus"
10-
"github.com/rancher/longhorn-engine/sync/agent"
9+
"github.com/sirupsen/logrus"
1110
"github.com/urfave/cli"
11+
12+
"github.com/rancher/longhorn-engine/sync/agent"
1213
)
1314

1415
func SyncAgentCmd() cli.Command {

‎app/volume.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"fmt"
66

7-
"github.com/Sirupsen/logrus"
7+
"github.com/sirupsen/logrus"
88
"github.com/urfave/cli"
99
)
1010

‎backend/file/file.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ package file
33
import (
44
"os"
55

6-
"github.com/Sirupsen/logrus"
6+
"github.com/sirupsen/logrus"
7+
78
"github.com/rancher/longhorn-engine/types"
89
)
910

‎backend/remote/remote.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import (
1010
"strconv"
1111
"time"
1212

13-
"github.com/Sirupsen/logrus"
13+
"github.com/sirupsen/logrus"
14+
1415
"github.com/rancher/longhorn-engine/replica/rest"
1516
"github.com/rancher/longhorn-engine/rpc"
1617
"github.com/rancher/longhorn-engine/types"

‎backup/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"runtime"
88
"runtime/debug"
99

10-
"github.com/Sirupsen/logrus"
1110
"github.com/pkg/errors"
11+
"github.com/sirupsen/logrus"
1212
"github.com/urfave/cli"
1313

1414
"github.com/rancher/backupstore"

‎controller/client/controller_client.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import (
99
"net/http"
1010
"strings"
1111

12-
"github.com/Sirupsen/logrus"
12+
"github.com/sirupsen/logrus"
13+
1314
"github.com/rancher/longhorn-engine/controller/rest"
1415
)
1516

‎controller/control.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sync/atomic"
1010
"time"
1111

12-
"github.com/Sirupsen/logrus"
12+
"github.com/sirupsen/logrus"
1313
"github.com/yasker/go-websocket-toolbox/broadcaster"
1414

1515
"github.com/rancher/longhorn-engine/types"

‎controller/rebuild.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"reflect"
66

7-
"github.com/Sirupsen/logrus"
87
"github.com/pkg/errors"
8+
"github.com/sirupsen/logrus"
99

1010
"github.com/rancher/longhorn-engine/replica/client"
1111
"github.com/rancher/longhorn-engine/types"

‎controller/replicator.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import (
88
"strings"
99
"sync"
1010

11-
"github.com/Sirupsen/logrus"
11+
"github.com/sirupsen/logrus"
12+
1213
"github.com/rancher/longhorn-engine/types"
1314
)
1415

‎controller/revert.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/Sirupsen/logrus"
7+
"github.com/sirupsen/logrus"
8+
89
"github.com/rancher/longhorn-engine/replica/client"
910
"github.com/rancher/longhorn-engine/types"
1011
"github.com/rancher/longhorn-engine/util"

‎frontend/rest/frontend.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import (
44
"net/http"
55
"os"
66

7-
"github.com/Sirupsen/logrus"
87
"github.com/gorilla/handlers"
8+
"github.com/sirupsen/logrus"
9+
910
"github.com/rancher/longhorn-engine/types"
1011
)
1112

‎frontend/socket/frontend.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88
"path/filepath"
99

10-
"github.com/Sirupsen/logrus"
10+
"github.com/sirupsen/logrus"
1111

1212
"github.com/rancher/longhorn-engine/rpc"
1313
"github.com/rancher/longhorn-engine/types"

‎frontend/tcmu/frontend.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"syscall"
1414
"time"
1515

16-
"github.com/Sirupsen/logrus"
1716
"github.com/pkg/errors"
17+
"github.com/sirupsen/logrus"
1818

1919
"github.com/rancher/longhorn-engine/types"
2020
"github.com/rancher/longhorn-engine/util"

‎frontend/tcmu/main.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ import (
2323
"sync"
2424
"unsafe"
2525

26-
"github.com/Sirupsen/logrus"
27-
"github.com/rancher/longhorn-engine/types"
26+
"github.com/sirupsen/logrus"
2827
"golang.org/x/sys/unix"
28+
29+
"github.com/rancher/longhorn-engine/types"
2930
)
3031

3132
var (

‎frontend/tgt/frontend.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/Sirupsen/logrus"
98
"github.com/pkg/errors"
9+
"github.com/sirupsen/logrus"
1010

1111
"github.com/rancher/longhorn-engine/frontend/socket"
1212
"github.com/rancher/longhorn-engine/iscsi"

‎iscsi/iscsi.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"strings"
77
"time"
88

9-
"github.com/Sirupsen/logrus"
109
"github.com/rancher/go-iscsi-helper/iscsi"
1110
iutil "github.com/rancher/go-iscsi-helper/util"
12-
"github.com/rancher/longhorn-engine/util"
11+
"github.com/sirupsen/logrus"
1312
"github.com/yasker/nsfilelock"
13+
14+
"github.com/rancher/longhorn-engine/util"
1415
)
1516

1617
var (

‎main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"runtime/debug"
99
"runtime/pprof"
1010

11-
"github.com/Sirupsen/logrus"
1211
"github.com/docker/docker/pkg/reexec"
1312
"github.com/rancher/sparse-tools/cli/sfold"
1413
"github.com/rancher/sparse-tools/cli/ssync"
14+
"github.com/sirupsen/logrus"
1515
"github.com/urfave/cli"
1616

1717
"github.com/rancher/longhorn-engine/app"

‎replica/client/client.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import (
1111
"strings"
1212
"time"
1313

14-
"github.com/Sirupsen/logrus"
14+
"github.com/sirupsen/logrus"
15+
1516
"github.com/rancher/longhorn-engine/replica/rest"
1617
"github.com/rancher/longhorn-engine/sync/agent"
1718
)

‎replica/replica.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ import (
1313
"sync"
1414
"syscall"
1515

16-
"github.com/Sirupsen/logrus"
1716
fibmap "github.com/frostschutz/go-fibmap"
1817
"github.com/pkg/errors"
18+
"github.com/sirupsen/logrus"
19+
1920
"github.com/rancher/longhorn-engine/types"
2021
"github.com/rancher/longhorn-engine/util"
2122
"github.com/rancher/sparse-tools/sparse"

‎replica/revision_counter.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import (
77
"strconv"
88
"strings"
99

10-
"github.com/Sirupsen/logrus"
10+
"github.com/sirupsen/logrus"
11+
1112
"github.com/rancher/sparse-tools/sparse"
1213
)
1314

‎replica/rpc/server.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ package rpc
33
import (
44
"net"
55

6-
"github.com/Sirupsen/logrus"
6+
"github.com/sirupsen/logrus"
7+
78
"github.com/rancher/longhorn-engine/replica"
89
"github.com/rancher/longhorn-engine/rpc"
910
)

‎replica/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"strings"
88
"sync"
99

10-
"github.com/Sirupsen/logrus"
1110
"github.com/pkg/errors"
1211
"github.com/rancher/backupstore"
12+
"github.com/sirupsen/logrus"
1313

1414
"github.com/rancher/longhorn-engine/util"
1515
)

‎rpc/client.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import (
66
"net"
77
"time"
88

9-
"github.com/Sirupsen/logrus"
9+
"github.com/sirupsen/logrus"
10+
1011
journal "github.com/rancher/sparse-tools/stats"
1112
)
1213

‎rpc/server.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import (
44
"io"
55
"net"
66

7-
"github.com/Sirupsen/logrus"
7+
"github.com/sirupsen/logrus"
8+
89
"github.com/rancher/longhorn-engine/types"
910
)
1011

‎sync/agent/process.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ import (
1111
"sync"
1212
"syscall"
1313

14-
"github.com/Sirupsen/logrus"
1514
"github.com/docker/docker/pkg/reexec"
1615
"github.com/gorilla/mux"
16+
"github.com/sirupsen/logrus"
17+
1718
"github.com/rancher/go-rancher/api"
1819
"github.com/rancher/go-rancher/client"
20+
1921
"github.com/rancher/longhorn-engine/types"
2022
"github.com/rancher/longhorn-engine/util"
2123
)

‎sync/backup.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ package sync
33
import (
44
"fmt"
55

6-
"github.com/Sirupsen/logrus"
6+
"github.com/sirupsen/logrus"
7+
78
"github.com/rancher/longhorn-engine/controller/rest"
89
"github.com/rancher/longhorn-engine/replica"
910
replicaClient "github.com/rancher/longhorn-engine/replica/client"

‎sync/sync.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/Sirupsen/logrus"
87
"github.com/pkg/errors"
8+
"github.com/sirupsen/logrus"
9+
910
"github.com/rancher/longhorn-engine/controller/client"
1011
"github.com/rancher/longhorn-engine/controller/rest"
1112
"github.com/rancher/longhorn-engine/replica"

‎util/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"syscall"
1515
"time"
1616

17-
"github.com/Sirupsen/logrus"
1817
"github.com/gorilla/handlers"
1918
"github.com/satori/go.uuid"
19+
"github.com/sirupsen/logrus"
2020
"golang.org/x/sys/unix"
2121
)
2222

0 commit comments

Comments
 (0)