Skip to content

Commit

Permalink
Update Sirupsen to sirupsen
Browse files Browse the repository at this point in the history
  • Loading branch information
yasker committed Mar 7, 2019
1 parent d0e8450 commit 333e65d
Show file tree
Hide file tree
Showing 145 changed files with 9,564 additions and 1,237 deletions.
5 changes: 3 additions & 2 deletions app/add_replica.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package app
import (
"errors"

"github.com/Sirupsen/logrus"
"github.com/rancher/longhorn-engine/sync"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

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

func AddReplicaCmd() cli.Command {
Expand Down
2 changes: 1 addition & 1 deletion app/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"os"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

"github.com/rancher/backupstore/cmd"
Expand Down
2 changes: 1 addition & 1 deletion app/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net/http"
"os"

"github.com/Sirupsen/logrus"
"github.com/gorilla/handlers"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

"github.com/rancher/longhorn-engine/backend/dynamic"
Expand Down
5 changes: 3 additions & 2 deletions app/ls_replica.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (
"os"
"text/tabwriter"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

"github.com/rancher/longhorn-engine/controller/client"
replicaClient "github.com/rancher/longhorn-engine/replica/client"
"github.com/urfave/cli"
)

func LsReplicaCmd() cli.Command {
Expand Down
5 changes: 3 additions & 2 deletions app/replica.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ import (
"path/filepath"
"syscall"

"github.com/Sirupsen/logrus"
"github.com/docker/go-units"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

"github.com/rancher/longhorn-engine/replica"
"github.com/rancher/longhorn-engine/replica/rest"
"github.com/rancher/longhorn-engine/replica/rpc"
"github.com/rancher/longhorn-engine/util"
"github.com/urfave/cli"
)

func ReplicaCmd() cli.Command {
Expand Down
2 changes: 1 addition & 1 deletion app/rm_replica.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app
import (
"errors"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)

Expand Down
2 changes: 1 addition & 1 deletion app/snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"text/tabwriter"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

"github.com/rancher/longhorn-engine/sync"
Expand Down
2 changes: 1 addition & 1 deletion app/stats.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package app

import (
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)

Expand Down
5 changes: 3 additions & 2 deletions app/sync_agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import (
"strconv"
"strings"

"github.com/Sirupsen/logrus"
"github.com/rancher/longhorn-engine/sync/agent"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

"github.com/rancher/longhorn-engine/sync/agent"
)

func SyncAgentCmd() cli.Command {
Expand Down
2 changes: 1 addition & 1 deletion app/volume.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)

Expand Down
3 changes: 2 additions & 1 deletion backend/file/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package file
import (
"os"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

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

Expand Down
3 changes: 2 additions & 1 deletion backend/remote/remote.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import (
"strconv"
"time"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/replica/rest"
"github.com/rancher/longhorn-engine/rpc"
"github.com/rancher/longhorn-engine/types"
Expand Down
2 changes: 1 addition & 1 deletion backup/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"runtime"
"runtime/debug"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

"github.com/rancher/backupstore"
Expand Down
3 changes: 2 additions & 1 deletion controller/client/controller_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import (
"net/http"
"strings"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/controller/rest"
)

Expand Down
2 changes: 1 addition & 1 deletion controller/control.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sync/atomic"
"time"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/yasker/go-websocket-toolbox/broadcaster"

"github.com/rancher/longhorn-engine/types"
Expand Down
2 changes: 1 addition & 1 deletion controller/rebuild.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"reflect"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/replica/client"
"github.com/rancher/longhorn-engine/types"
Expand Down
3 changes: 2 additions & 1 deletion controller/replicator.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import (
"strings"
"sync"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

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

Expand Down
3 changes: 2 additions & 1 deletion controller/revert.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import (
"fmt"
"strings"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/replica/client"
"github.com/rancher/longhorn-engine/types"
"github.com/rancher/longhorn-engine/util"
Expand Down
3 changes: 2 additions & 1 deletion frontend/rest/frontend.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import (
"net/http"
"os"

"github.com/Sirupsen/logrus"
"github.com/gorilla/handlers"
"github.com/sirupsen/logrus"

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

Expand Down
2 changes: 1 addition & 1 deletion frontend/socket/frontend.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"path/filepath"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/rpc"
"github.com/rancher/longhorn-engine/types"
Expand Down
2 changes: 1 addition & 1 deletion frontend/tcmu/frontend.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"syscall"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/types"
"github.com/rancher/longhorn-engine/util"
Expand Down
5 changes: 3 additions & 2 deletions frontend/tcmu/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ import (
"sync"
"unsafe"

"github.com/Sirupsen/logrus"
"github.com/rancher/longhorn-engine/types"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"

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

var (
Expand Down
2 changes: 1 addition & 1 deletion frontend/tgt/frontend.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"path/filepath"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/frontend/socket"
"github.com/rancher/longhorn-engine/iscsi"
Expand Down
5 changes: 3 additions & 2 deletions iscsi/iscsi.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import (
"strings"
"time"

"github.com/Sirupsen/logrus"
"github.com/rancher/go-iscsi-helper/iscsi"
iutil "github.com/rancher/go-iscsi-helper/util"
"github.com/rancher/longhorn-engine/util"
"github.com/sirupsen/logrus"
"github.com/yasker/nsfilelock"

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

var (
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"runtime/debug"
"runtime/pprof"

"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/reexec"
"github.com/rancher/sparse-tools/cli/sfold"
"github.com/rancher/sparse-tools/cli/ssync"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"

"github.com/rancher/longhorn-engine/app"
Expand Down
3 changes: 2 additions & 1 deletion replica/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import (
"strings"
"time"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/replica/rest"
"github.com/rancher/longhorn-engine/sync/agent"
)
Expand Down
3 changes: 2 additions & 1 deletion replica/replica.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ import (
"sync"
"syscall"

"github.com/Sirupsen/logrus"
fibmap "github.com/frostschutz/go-fibmap"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/types"
"github.com/rancher/longhorn-engine/util"
"github.com/rancher/sparse-tools/sparse"
Expand Down
3 changes: 2 additions & 1 deletion replica/revision_counter.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import (
"strconv"
"strings"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"github.com/rancher/sparse-tools/sparse"
)

Expand Down
3 changes: 2 additions & 1 deletion replica/rpc/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package rpc
import (
"net"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/replica"
"github.com/rancher/longhorn-engine/rpc"
)
Expand Down
2 changes: 1 addition & 1 deletion replica/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"strings"
"sync"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/rancher/backupstore"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/util"
)
Expand Down
3 changes: 2 additions & 1 deletion rpc/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import (
"net"
"time"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

journal "github.com/rancher/sparse-tools/stats"
)

Expand Down
3 changes: 2 additions & 1 deletion rpc/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import (
"io"
"net"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

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

Expand Down
4 changes: 3 additions & 1 deletion sync/agent/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ import (
"sync"
"syscall"

"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/reexec"
"github.com/gorilla/mux"
"github.com/sirupsen/logrus"

"github.com/rancher/go-rancher/api"
"github.com/rancher/go-rancher/client"

"github.com/rancher/longhorn-engine/types"
"github.com/rancher/longhorn-engine/util"
)
Expand Down
3 changes: 2 additions & 1 deletion sync/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package sync
import (
"fmt"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/controller/rest"
"github.com/rancher/longhorn-engine/replica"
replicaClient "github.com/rancher/longhorn-engine/replica/client"
Expand Down
3 changes: 2 additions & 1 deletion sync/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import (
"fmt"
"strings"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/rancher/longhorn-engine/controller/client"
"github.com/rancher/longhorn-engine/controller/rest"
"github.com/rancher/longhorn-engine/replica"
Expand Down
2 changes: 1 addition & 1 deletion util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"syscall"
"time"

"github.com/Sirupsen/logrus"
"github.com/gorilla/handlers"
"github.com/satori/go.uuid"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
)

Expand Down
Loading

0 comments on commit 333e65d

Please sign in to comment.