stanley-king 3 years ago
parent
commit
84c786a5a2

+ 39 - 0
docker/compose/xyz/acc/docker-compose.yml

@@ -0,0 +1,39 @@
+version: "3.7"
+
+services:
+  nginxsrv:
+    image: nginx:alpine
+    ports:
+      - "80:80"
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+      - /nfs/upload:/var/www/html/data/upload
+      - /nfs/merchant:/var/www/html/merchant
+    container_name: "panda-nginx"
+    command: [nginx,'-g','daemon off;']
+    extra_hosts:
+      - "docker.hostip:172.17.0.1"
+    deploy:
+      resources:
+        limits:
+          cpus: '8'
+
+  mobilesrv:
+    image: php-zts:7.3.18
+    ports:
+      - "9100:9100"
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+      - ../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
+    container_name: "panda-mobile"
+    command: ['docker-spwan-start']
+    deploy:
+      resources:
+        limits:
+          cpus: '8'

+ 1 - 45
docker/compose/xyz/arw/docker-compose.yml

@@ -1,35 +1,6 @@
 version: "3.7"
 
 services:
-  nginxsrv:
-    image: nginx:alpine
-    ports:
-      - "80:80"
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - /nfs/upload:/var/www/html/data/upload
-      - /nfs/merchant:/var/www/html/merchant
-    container_name: "panda-nginx"
-    command: [nginx,'-g','daemon off;']
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-
-  mobilesrv:
-    image: php-zts:7.3.18
-    ports:
-      - "9100:9100"
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-      - ../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
-    container_name: "panda-mobile"
-    command: ['docker-spwan-start']
-
   cordsrv:
     image: php-swool-redis:latest
     volumes:
@@ -39,27 +10,12 @@ services:
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-codispatcher"
-    command: [php,"/var/www/html/rdispatcher/codispatcher.php","16"]
+    command: [php,"/var/www/html/rdispatcher/codispatcher.php","32"]
     deploy:
       resources:
         limits:
           cpus: '8'
 
-#  cordsrv:
-#    image: php-swool-hook:7.3.18
-#    volumes:
-#      - ../../../../:/var/www/html
-#      - ../conf/etc/localtime:/etc/localtime:ro
-#      - ../conf/php/php-swoole.ini:/usr/local/etc/php/php.ini
-#      - /nfs/upload:/var/www/html/data/upload
-#      - /mnt/shoplog:/var/www/html/data/log
-#    container_name: "panda-codispatcher"
-#    command: [php,"/var/www/html/rdispatcher/coall.php","16"]
-#    deploy:
-#      resources:
-#        limits:
-#          cpus: '8'
-
   queuesrv:
     image: php-zts-debug:7.3.18
     volumes:

docker/compose/xyz/arw/restart_all.sh → docker/compose/xyz/worker/restart_all.sh


docker/compose/xyz/arw/restart_cordsrv.sh → docker/compose/xyz/worker/restart_cordsrv.sh


docker/compose/xyz/arw/stop_all.sh → docker/compose/xyz/worker/stop_all.sh


+ 2 - 0
rdispatcher/codispatcher.php

@@ -21,6 +21,8 @@ require_once(BASE_PATH . '/processor.php');
 require_once(BASE_PATH . '/proxy.php');
 
 Co::set(['hook_flags' => SWOOLE_HOOK_NATIVE_CURL|SWOOLE_HOOK_SLEEP]);
+Co::set(['socket_connect_timeout' => 60,'socket_read_timeout' => 900,'socket_write_timeout' => 900,'socket_timeout' => 900]);
+
 if (empty($_SERVER['argv'][1])) exit('parameter error');
 $process_count = intval($_SERVER['argv'][1]);