Merge pull request #289 from spiral/rr_1.7.0v1.7.0

Update to v2

8 files changed, 9 insertions, 6 deletions

diff --git a/go.mod b/go.mod
index 8fbf416f..a9935c0b 100644
--- a/go.mod
+++ b/go.mod
@@ -19,6 +19,7 @@ require (
 	github.com/spf13/cobra v0.0.6
 	github.com/spf13/viper v1.6.2
 	github.com/spiral/goridge/v2 v2.3.0
+	github.com/stretchr/testify v1.4.0
 	github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a
 	github.com/yookoala/gofast v0.4.0
 	golang.org/x/net v0.0.0-20200222125558-5a598a2470a0
diff --git a/go.sum b/go.sum
index a1a1ad62..d1c29429 100644
--- a/go.sum
+++ b/go.sum
@@ -218,9 +218,11 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E=
 github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
+github.com/spiral/goridge v1.0.4 h1:qnYtI84H0tcYjcbFdFl/VUFQZ0YUE9p+VuU8In4kC/8=
 github.com/spiral/goridge v2.1.3+incompatible/go.mod h1:prfLTN9qOpQxO6dtfCMJZ+uguUdCxb/ntS8ML/s5U2U=
 github.com/spiral/goridge v2.1.4+incompatible h1:L15TKrbPEp/G6JfS3jjuvY6whkhfD292XX+1iy9mO2k=
 github.com/spiral/goridge v2.1.4+incompatible/go.mod h1:prfLTN9qOpQxO6dtfCMJZ+uguUdCxb/ntS8ML/s5U2U=
+github.com/spiral/goridge/v2 v2.3.0 h1:oQs0Njior19jCt88YAMmcnpyiZCApF1lMrYLS7O313U=
 github.com/spiral/goridge/v2 v2.3.0/go.mod h1:NxcCipXONzZ6smmLUl9SsnT/YJjIjDphIfbzRJICLd8=
 github.com/spiral/jobs v1.1.4 h1:vyLYlZPrCLLBlcuIP/wxGOSw+PqQzz5VwHeHRbXId5I=
 github.com/spiral/jobs v1.1.4/go.mod h1:uBmVraLkPztuIzcneADDaqtKq/UEOXEvC/PAlBt5ltA=
diff --git a/pipe_factory.go b/pipe_factory.go
index d8243d28..9696a474 100644
--- a/pipe_factory.go
+++ b/pipe_factory.go
@@ -3,7 +3,7 @@ package roadrunner
 import (
 	"fmt"
 	"github.com/pkg/errors"
-	"github.com/spiral/goridge"
+	"github.com/spiral/goridge/v2"
 	"io"
 	"os/exec"
 )
diff --git a/protocol.go b/protocol.go
index b2836289..b00eb2a4 100644
--- a/protocol.go
+++ b/protocol.go
@@ -3,7 +3,7 @@ package roadrunner
 import (
 	"fmt"
 	json "github.com/json-iterator/go"
-	"github.com/spiral/goridge"
+	"github.com/spiral/goridge/v2"
 	"os"
 )
 
diff --git a/protocol_test.go b/protocol_test.go
index 526945cb..55c603a5 100644
--- a/protocol_test.go
+++ b/protocol_test.go
@@ -2,7 +2,7 @@ package roadrunner
 
 import (
 	"github.com/pkg/errors"
-	"github.com/spiral/goridge"
+	"github.com/spiral/goridge/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/service/rpc/service.go b/service/rpc/service.go
index eba74c2d..7a649f1b 100644
--- a/service/rpc/service.go
+++ b/service/rpc/service.go
@@ -2,7 +2,7 @@ package rpc
 
 import (
 	"errors"
-	"github.com/spiral/goridge"
+	"github.com/spiral/goridge/v2"
 	"github.com/spiral/roadrunner/service"
 	"github.com/spiral/roadrunner/service/env"
 	"net/rpc"
diff --git a/socket_factory.go b/socket_factory.go
index 84515f64..42196588 100644
--- a/socket_factory.go
+++ b/socket_factory.go
@@ -3,7 +3,7 @@ package roadrunner
 import (
 	"fmt"
 	"github.com/pkg/errors"
-	"github.com/spiral/goridge"
+	"github.com/spiral/goridge/v2"
 	"net"
 	"os/exec"
 	"sync"
diff --git a/worker.go b/worker.go
index 1b788231..731af9fd 100644
--- a/worker.go
+++ b/worker.go
@@ -3,7 +3,7 @@ package roadrunner
 import (
 	"fmt"
 	"github.com/pkg/errors"
-	"github.com/spiral/goridge"
+	"github.com/spiral/goridge/v2"
 	"os"
 	"os/exec"
 	"strconv"