Преглед на файлове

添加代理服务配置

dzr преди 8 месеца
родител
ревизия
4fd167c495
променени са 2 файла, в които са добавени 25 реда и са изтрити 4 реда
  1. 23 2
      docker-compose.yml
  2. 2 2
      services/proxy.py

+ 23 - 2
docker-compose.yml

@@ -20,12 +20,13 @@ services:
       - producer_network
     command: 'python3 produce_task.py'
 
-  consumer:
+  py-tools:
     container_name: pytools-server
     image: 172.17.189.142:8081/pyspider/pytools:latest
     volumes: # 映射文件夹
       - /mnt/pytools:/mnt
-    network_mode: "host"
+    ports:
+      - "1407:1405"
     restart: always
     privileged: true
     logging:
@@ -39,6 +40,26 @@ services:
           memory: 10M
     command: 'python3 -m gunicorn -c gunicorn.conf.py pytools_main:app'
 
+  py-proxy:
+    container_name: pytools-proxy
+    image: 172.17.189.142:8081/pyspider/pytools:latest
+    volumes: # 映射文件夹
+      - /mnt/pytools:/mnt
+    ports:
+      - "1405:1405"
+    restart: always
+    privileged: true
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1G"
+        max-file: "1"
+    deploy:
+      resources:
+        reservations:
+          memory: 10M
+    command: './py_proxy_linux'
+
 networks:
   producer_network:
     driver: bridge

+ 2 - 2
services/proxy.py

@@ -146,7 +146,7 @@ class ProxyPoolServer(BaseProxyPool, threading.Thread):
             elif pk == 2:
                 self.redis_db.rpush(self.lst_name_2, host)
 
-            logger.debug(f"添加代理|{host}")
+            logger.info(f"添加代理|{host}")
 
     def del_proxy(self, proxy):
         host = get_host(proxy['proxies'], self.scheme)
@@ -160,7 +160,7 @@ class ProxyPoolServer(BaseProxyPool, threading.Thread):
 
         n0 = self.redis_db.lrem(self.lst_name, 0, host)  # 移除所有匹配的元素
         self.redis_db.hdel(self.tab_name, host)
-        logger.debug(f"移除代理|{host}|{n1 + n0}")
+        logger.info(f"移除代理|{host}|{n1 + n0}")
 
     def update_proxy(self, proxy, success):
         """