Merge remote-tracking branch 'origin/master'

4 files changed, 9 insertions, 3 deletions

diff --git a/.rr.yaml b/.rr.yaml
index 481392e2..4e00f0f7 100644
--- a/.rr.yaml
+++ b/.rr.yaml
@@ -70,7 +70,7 @@ limit:
   services:
     # monitor http workers
     http:
-      # maximum allowed memory consumption (soft)
+      # maximum allowed memory consumption per worker (soft)
       maxMemory: 100
 
       # maximum time to live for the worker (soft)
@@ -88,4 +88,4 @@ static:
   dir:   "public"
 
   # list of extensions for forbid for serving.
-  forbid: [".php", ".htaccess"]
\ No newline at end of file
+  forbid: [".php", ".htaccess"]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9253a4de..2b58dfea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,13 @@
 CHANGELOG
 =========
 
+v1.4.1 (15.05.2019)
+-------------------
+- constrain service renamed to "limit" to equalize the definition with sample config
+
 v1.4.0 (05.05.2019)
 -------------------
+- launch of official website https://roadrunner.dev/
 - ENV variables in configs (automatic RR_ mapping and manual definition using "${ENV_NAME}" value)
 - the ability to safely remove the worker from the pool in runtime
 - minor performance improvements
diff --git a/README.md b/README.md
index 0de0e15e..11cdc8db 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,7 @@ Features:
 - payload context and body
 - protocol, worker and job level error management (including PHP errors)
 - very fast (~250k rpc calls per second on Ryzen 1700X using 16 threads)
+- integrations with Symfony, Laravel, Slim, CakePHP, Zend Expressive, Spiral
 - works on Windows
 
 Example:
diff --git a/service/limit/service.go b/service/limit/service.go
index 6cbc22be..6af571e2 100644
--- a/service/limit/service.go
+++ b/service/limit/service.go
@@ -6,7 +6,7 @@ import (
 )
 
 // ID defines controller service name.
-const ID = "constrain"
+const ID = "limit"
 
 // controllable defines the ability to attach rr controller.
 type controllable interface {