Browse Source

Updating Swoole version (#4070)

* Adding Hamlet 3
Adding Hamlet 3 / Swoole Integration

* Update Swoole version,
Limit number of processes run by swoole

* Optimize composer autoloader
Vasily Kartashov 6 years ago
parent
commit
91e6167f42

+ 3 - 3
frameworks/PHP/hamlet/hamlet-swoole.dockerfile

@@ -1,6 +1,6 @@
 FROM php:7.2
 FROM php:7.2
 
 
-ENV SWOOLE_VERSION=4.0.4
+ENV SWOOLE_VERSION=4.2.1
 
 
 RUN cd /tmp && curl -sSL "https://github.com/swoole/swoole-src/archive/v${SWOOLE_VERSION}.tar.gz" | tar xzf - \
 RUN cd /tmp && curl -sSL "https://github.com/swoole/swoole-src/archive/v${SWOOLE_VERSION}.tar.gz" | tar xzf - \
         && cd swoole-src-${SWOOLE_VERSION} \
         && cd swoole-src-${SWOOLE_VERSION} \
@@ -16,6 +16,6 @@ ADD ./ /hamlet
 WORKDIR /hamlet
 WORKDIR /hamlet
 
 
 RUN chmod -R 777 /hamlet
 RUN chmod -R 777 /hamlet
-RUN composer update
+RUN composer update --optimize-autoloader
 
 
-CMD php /hamlet/swoole.php
+CMD sed -i 's|NUMCORES|'"$(nproc)"'|g' swoole.php && php swoole.php

+ 1 - 1
frameworks/PHP/hamlet/hamlet.dockerfile

@@ -16,7 +16,7 @@ WORKDIR /php
 
 
 RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 2048|pm.max_children = 512|g" /etc/php/7.2/fpm/php-fpm.conf ; fi;
 RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 2048|pm.max_children = 512|g" /etc/php/7.2/fpm/php-fpm.conf ; fi;
 
 
-RUN composer install --quiet
+RUN composer install --quiet --optimize-autoloader
 
 
 RUN chmod -R 777 /php
 RUN chmod -R 777 /php
 
 

+ 6 - 0
frameworks/PHP/hamlet/swoole.php

@@ -1,7 +1,13 @@
 <?php
 <?php
 
 
+use Swoole\Http\Server;
+
 require_once __DIR__ . '/vendor/autoload.php';
 require_once __DIR__ . '/vendor/autoload.php';
 
 
 \Hamlet\Bootstraps\SwooleBootstrap::run('0.0.0.0', 8080, function () {
 \Hamlet\Bootstraps\SwooleBootstrap::run('0.0.0.0', 8080, function () {
     return new \Benchmark\Application;
     return new \Benchmark\Application;
+}, function (Server $server) {
+    $server->set([
+        'worker_num' => NUMCORES
+    ]);
 });
 });