summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/server/tests/socket.php6
-rw-r--r--plugins/server/tests/tcp.php8
-rwxr-xr-xworker.go8
3 files changed, 15 insertions, 7 deletions
diff --git a/plugins/server/tests/socket.php b/plugins/server/tests/socket.php
index 143c3ce4..1b76481a 100644
--- a/plugins/server/tests/socket.php
+++ b/plugins/server/tests/socket.php
@@ -6,7 +6,7 @@
use Spiral\Goridge;
use Spiral\RoadRunner;
-require dirname(__DIR__) . "/../../vendor_php/autoload.php";
+require dirname(__DIR__) . "/../../tests/vendor/autoload.php";
$relay = new Goridge\SocketRelay(
"unix.sock",
@@ -16,9 +16,9 @@ $relay = new Goridge\SocketRelay(
$rr = new RoadRunner\Worker($relay);
-while ($in = $rr->receive($ctx)) {
+while ($in = $rr->waitPayload()) {
try {
- $rr->send((string)$in);
+ $rr->send((string)$in->body);
} catch (\Throwable $e) {
$rr->error((string)$e);
}
diff --git a/plugins/server/tests/tcp.php b/plugins/server/tests/tcp.php
index 2d6fb00a..c567c982 100644
--- a/plugins/server/tests/tcp.php
+++ b/plugins/server/tests/tcp.php
@@ -6,15 +6,15 @@
use Spiral\Goridge;
use Spiral\RoadRunner;
-require dirname(__DIR__) . "/../../vendor_php/autoload.php";
+require dirname(__DIR__) . "/../../tests/vendor/autoload.php";
$relay = new Goridge\SocketRelay("localhost", 9999);
$rr = new RoadRunner\Worker($relay);
-while ($in = $rr->receive($ctx)) {
+while ($in = $rr->waitPayload()) {
try {
- $rr->send((string)$in);
+ $rr->send((string)$in->body);
} catch (\Throwable $e) {
$rr->error((string)$e);
}
-} \ No newline at end of file
+}
diff --git a/worker.go b/worker.go
index 5682f551..2fd77047 100755
--- a/worker.go
+++ b/worker.go
@@ -18,6 +18,14 @@ import (
"go.uber.org/multierr"
)
+// #include <stdio.h>
+// #include <errno.h>
+import "C"
+
+func init() {
+ C.setvbuf(C.stderr, nil, C._IONBF, 0)
+}
+
const (
// WaitDuration - for how long error buffer should attempt to aggregate error messages
// before merging output together since lastError update (required to keep error update together).