summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml8
-rw-r--r--CHANGELOG.md8
-rwxr-xr-xbuild.sh2
-rw-r--r--go.mod51
-rw-r--r--service/http/config.go4
-rw-r--r--service/http/service.go8
-rw-r--r--service/http/ssl_test.go10
7 files changed, 36 insertions, 55 deletions
diff --git a/.travis.yml b/.travis.yml
index 13d0d7a5..204518a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,13 +15,7 @@ before_install:
- composer self-update
install:
- - go get "github.com/spiral/roadrunner"
- - go get -u "github.com/spiral/goridge"
- - go get -u "github.com/sirupsen/logrus"
- - go get -u "github.com/pkg/errors"
- - go get -u "github.com/stretchr/testify/assert"
- - go get -u "github.com/shirou/gopsutil/process"
- - go get -u "golang.org/x/net/http2"
+ - go mod download
- composer install --no-interaction --prefer-source --ignore-platform-reqs
script:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d147c5d..a5b35725 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
CHANGELOG
=========
+v1.2.4 (30.09.2018)
+------
+- minor performance improvements (reduced number of syscalls)
+- worker factory connection is not exposed to server using RR_RELAY env
+- HTTPS support
+- HTTP/2 and HTTP/2 Support
+- Removed `disable` flag of static service
+
v1.2.3 (29.09.2018)
------
- reduced verbosity
diff --git a/build.sh b/build.sh
index 32964a57..4540c912 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
cd $(dirname "${BASH_SOURCE[0]}")
OD="$(pwd)"
# Pushes application version into the build information.
-RR_VERSION=1.2.3
+RR_VERSION=1.2.4
# Hardcode some values to the core package
LDFLAGS="$LDFLAGS -X github.com/spiral/roadrunner/cmd/rr/cmd.Version=${RR_VERSION}"
diff --git a/go.mod b/go.mod
index 28a6fac0..c0470c75 100644
--- a/go.mod
+++ b/go.mod
@@ -1,45 +1,24 @@
module github.com/spiral/roadrunner
require (
- github.com/BurntSushi/toml v0.3.0
- github.com/StackExchange/wmi v0.0.0-20180412205111-cdffdb33acae
+ github.com/BurntSushi/toml v0.3.1 // indirect
+ github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect
github.com/buger/goterm v0.0.0-20180423150900-6d19e6a8df12
- github.com/davecgh/go-spew v1.1.0
- github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e
- github.com/fsnotify/fsnotify v1.4.7
- github.com/go-ole/go-ole v1.2.1
- github.com/golang/protobuf v1.1.0
- github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
- github.com/inconshreveable/mousetrap v1.0.0
- github.com/magiconair/properties v1.8.0
- github.com/mattn/go-colorable v0.0.9
- github.com/mattn/go-isatty v0.0.3
- github.com/mattn/go-runewidth v0.0.2
+ github.com/dustin/go-humanize v0.0.0-20180713052910-9f541cc9db5d
+ github.com/go-ole/go-ole v1.2.1 // indirect
+ github.com/inconshreveable/mousetrap v1.0.0 // indirect
+ github.com/mattn/go-colorable v0.0.9 // indirect
+ github.com/mattn/go-isatty v0.0.4 // indirect
+ github.com/mattn/go-runewidth v0.0.3 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
- github.com/mitchellh/mapstructure v0.0.0-20180511142126-bb74f1db0675
- github.com/olekukonko/tablewriter v0.0.0-20180506121414-d4647c9c7a84
- github.com/onsi/ginkgo v1.5.0
- github.com/onsi/gomega v1.4.0
- github.com/pelletier/go-toml v1.2.0
+ github.com/olekukonko/tablewriter v0.0.0-20180912035003-be2c049b30cc
github.com/pkg/errors v0.8.0
- github.com/pmezard/go-difflib v1.0.0
- github.com/shirou/gopsutil v0.0.0-20180613084040-c23bcca55e77
- github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4
- github.com/sirupsen/logrus v1.0.5
- github.com/spf13/afero v1.1.1
- github.com/spf13/cast v1.2.0
+ github.com/shirou/gopsutil v2.17.12+incompatible
+ github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
+ github.com/sirupsen/logrus v1.1.0
github.com/spf13/cobra v0.0.3
- github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec
- github.com/spf13/pflag v1.0.1
- github.com/spf13/viper v1.0.2
- github.com/spiral/goridge v0.0.0-20180607130832-0351012be508
+ github.com/spf13/viper v1.2.1
+ github.com/spiral/goridge v2.1.2+incompatible
github.com/stretchr/testify v1.2.2
- golang.org/x/crypto v0.0.0-20180614221331-a8fb68e7206f
- golang.org/x/net v0.0.0-20180709032641-4d581e05a3ac
- golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f
- golang.org/x/sys v0.0.0-20180615093615-8014b7b116a6
- golang.org/x/text v0.3.0
- gopkg.in/airbrake/gobrake.v2 v2.0.9
- gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2
- gopkg.in/yaml.v2 v2.2.1
+ golang.org/x/net v0.0.0-20180926154720-4dfa2610cdf3
)
diff --git a/service/http/config.go b/service/http/config.go
index 54380d11..14738d2e 100644
--- a/service/http/config.go
+++ b/service/http/config.go
@@ -2,11 +2,11 @@ package http
import (
"errors"
+ "fmt"
"github.com/spiral/roadrunner"
"github.com/spiral/roadrunner/service"
- "strings"
"os"
- "fmt"
+ "strings"
)
// Config configures RoadRunner HTTP server.
diff --git a/service/http/service.go b/service/http/service.go
index bea71d25..1f999b8b 100644
--- a/service/http/service.go
+++ b/service/http/service.go
@@ -2,17 +2,17 @@ package http
import (
"context"
+ "fmt"
"github.com/spiral/roadrunner"
"github.com/spiral/roadrunner/service/env"
"github.com/spiral/roadrunner/service/http/attributes"
"github.com/spiral/roadrunner/service/rpc"
+ "golang.org/x/net/http2"
"net/http"
+ "net/url"
+ "strings"
"sync"
"sync/atomic"
- "golang.org/x/net/http2"
- "strings"
- "fmt"
- "net/url"
)
const (
diff --git a/service/http/ssl_test.go b/service/http/ssl_test.go
index 5fcd19ce..63eb90b1 100644
--- a/service/http/ssl_test.go
+++ b/service/http/ssl_test.go
@@ -1,15 +1,15 @@
package http
import (
- "testing"
- "github.com/sirupsen/logrus/hooks/test"
+ "crypto/tls"
"github.com/sirupsen/logrus"
+ "github.com/sirupsen/logrus/hooks/test"
"github.com/spiral/roadrunner/service"
"github.com/stretchr/testify/assert"
- "time"
- "net/http"
"io/ioutil"
- "crypto/tls"
+ "net/http"
+ "testing"
+ "time"
)
var sslClient = &http.Client{