EFRS-1265: Renamed connection/read timeouts

gusdoe · Jul 22, 2022 · 4a14a1b · 4a14a1b
1 parent 4987fbc
commit 4a14a1b
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 44 deletions.
diff --git a/.env b/.env
@@ -16,8 +16,8 @@ max_file_size=5MB
 max_request_size=10M
 uwsgi_processes=2
 uwsgi_threads=1
-feign_faces_connection_timeout=10000
-feign_faces_read_timeout=60000
+connection_timeout=10000
+read_timeout=60000
 ADMIN_VERSION=1.0.0
 API_VERSION=1.0.0
 FE_VERSION=1.0.0

diff --git a/custom-builds/FaceNet/.env b/custom-builds/FaceNet/.env
@@ -16,8 +16,8 @@ max_file_size=5MB
 max_request_size=10M
 uwsgi_processes=2
 uwsgi_threads=1
-feign_faces_connection_timeout=10000
-feign_faces_read_timeout=60000
+connection_timeout=10000
+read_timeout=60000
 ADMIN_VERSION=1.0.0
 API_VERSION=1.0.0
 FE_VERSION=1.0.0

diff --git a/custom-builds/FaceNet/docker-compose.yml b/custom-builds/FaceNet/docker-compose.yml
@@ -51,8 +51,8 @@ services:
       - SAVE_IMAGES_TO_DB=${save_images_to_db}
       - MAX_FILE_SIZE=${max_file_size}
       - MAX_REQUEST_SIZE=${max_request_size}B
-      - FEIGN_FACES_CONNECTION_TIMEOUT=${feign_faces_connection_timeout}
-      - FEIGN_FACES_READ_TIMEOUT=${feign_faces_read_timeout}
+      - CONNECTION_TIMEOUT=${connection_timeout}
+      - READ_TIMEOUT=${read_timeout}
 
   compreface-fe:
     image: ${registry}compreface-fe:${FE_VERSION}

diff --git a/custom-builds/Mobilenet-gpu/.env b/custom-builds/Mobilenet-gpu/.env
@@ -16,8 +16,8 @@ max_file_size=5MB
 max_request_size=10M
 uwsgi_processes=1
 uwsgi_threads=1
-feign_faces_connection_timeout=10000
-feign_faces_read_timeout=60000
+connection_timeout=10000
+read_timeout=60000
 ADMIN_VERSION=1.0.0
 API_VERSION=1.0.0
 FE_VERSION=1.0.0

diff --git a/custom-builds/Mobilenet-gpu/docker-compose.yml b/custom-builds/Mobilenet-gpu/docker-compose.yml
@@ -51,8 +51,8 @@ services:
       - SAVE_IMAGES_TO_DB=${save_images_to_db}
       - MAX_FILE_SIZE=${max_file_size}
       - MAX_REQUEST_SIZE=${max_request_size}B
-      - FEIGN_FACES_CONNECTION_TIMEOUT=${feign_faces_connection_timeout}
-      - FEIGN_FACES_READ_TIMEOUT=${feign_faces_read_timeout}
+      - CONNECTION_TIMEOUT=${connection_timeout}
+      - READ_TIMEOUT=${read_timeout}
 
   compreface-fe:
     image: ${registry}compreface-fe:${FE_VERSION}

diff --git a/custom-builds/Mobilenet/.env b/custom-builds/Mobilenet/.env
@@ -16,8 +16,8 @@ max_file_size=5MB
 max_request_size=10M
 uwsgi_processes=2
 uwsgi_threads=1
-feign_faces_connection_timeout=10000
-feign_faces_read_timeout=60000
+connection_timeout=10000
+read_timeout=60000
 ADMIN_VERSION=1.0.0
 API_VERSION=1.0.0
 FE_VERSION=1.0.0

diff --git a/custom-builds/Mobilenet/docker-compose.yml b/custom-builds/Mobilenet/docker-compose.yml
@@ -51,8 +51,8 @@ services:
       - SAVE_IMAGES_TO_DB=${save_images_to_db}
       - MAX_FILE_SIZE=${max_file_size}
       - MAX_REQUEST_SIZE=${max_request_size}B
-      - FEIGN_FACES_CONNECTION_TIMEOUT=${feign_faces_connection_timeout}
-      - FEIGN_FACES_READ_TIMEOUT=${feign_faces_read_timeout}
+      - CONNECTION_TIMEOUT=${connection_timeout}
+      - READ_TIMEOUT=${read_timeout}
 
   compreface-fe:
     image: ${registry}compreface-fe:${FE_VERSION}

diff --git a/custom-builds/Single-Docker-File/Dockerfile b/custom-builds/Single-Docker-File/Dockerfile
@@ -74,8 +74,8 @@ ENV APPERY_API_KEY ${APPERY_API_KEY}
 ENV API_JAVA_OPTS=-Xmx4g
 ENV SAVE_IMAGES_TO_DB=true
 ENV API_PORT=8080
-ENV FEIGN_FACES_CONNECTION_TIMEOUT=10000
-ENV FEIGN_FACES_READ_TIMEOUT=60000
+ENV CONNECTION_TIMEOUT=10000
+ENV READ_TIMEOUT=60000
 
 COPY --from=api /home/app.jar /app/api/app.jar
 

diff --git a/custom-builds/SubCenter-ArcFace-r100-gpu/.env b/custom-builds/SubCenter-ArcFace-r100-gpu/.env
@@ -16,8 +16,8 @@ max_file_size=5MB
 max_request_size=10M
 uwsgi_processes=2
 uwsgi_threads=1
-feign_faces_connection_timeout=10000
-feign_faces_read_timeout=60000
+connection_timeout=10000
+read_timeout=60000
 ADMIN_VERSION=1.0.0
 API_VERSION=1.0.0
 FE_VERSION=1.0.0

diff --git a/custom-builds/SubCenter-ArcFace-r100-gpu/docker-compose.yml b/custom-builds/SubCenter-ArcFace-r100-gpu/docker-compose.yml
@@ -51,8 +51,8 @@ services:
       - SAVE_IMAGES_TO_DB=${save_images_to_db}
       - MAX_FILE_SIZE=${max_file_size}
       - MAX_REQUEST_SIZE=${max_request_size}B
-      - FEIGN_FACES_CONNECTION_TIMEOUT=${feign_faces_connection_timeout}
-      - FEIGN_FACES_READ_TIMEOUT=${feign_faces_read_timeout}
+      - CONNECTION_TIMEOUT=${connection_timeout}
+      - READ_TIMEOUT=${read_timeout}
 
   compreface-fe:
     image: ${registry}compreface-fe:${FE_VERSION}

diff --git a/custom-builds/SubCenter-ArcFace-r100/.env b/custom-builds/SubCenter-ArcFace-r100/.env
@@ -16,8 +16,8 @@ max_file_size=5MB
 max_request_size=10M
 uwsgi_processes=2
 uwsgi_threads=1
-feign_faces_connection_timeout=10000
-feign_faces_read_timeout=60000
+connection_timeout=10000
+read_timeout=60000
 ADMIN_VERSION=1.0.0
 API_VERSION=1.0.0
 FE_VERSION=1.0.0

diff --git a/custom-builds/SubCenter-ArcFace-r100/docker-compose.yml b/custom-builds/SubCenter-ArcFace-r100/docker-compose.yml
@@ -51,8 +51,8 @@ services:
       - SAVE_IMAGES_TO_DB=${save_images_to_db}
       - MAX_FILE_SIZE=${max_file_size}
       - MAX_REQUEST_SIZE=${max_request_size}B
-      - FEIGN_FACES_CONNECTION_TIMEOUT=${feign_faces_connection_timeout}
-      - FEIGN_FACES_READ_TIMEOUT=${feign_faces_read_timeout}
+      - CONNECTION_TIMEOUT=${connection_timeout}
+      - READ_TIMEOUT=${read_timeout}
 
   compreface-fe:
     image: ${registry}compreface-fe:${FE_VERSION}

diff --git a/dev/.env b/dev/.env
@@ -16,8 +16,8 @@ max_file_size=5MB
 max_request_size=10M
 uwsgi_processes=2
 uwsgi_threads=1
-feign_faces_connection_timeout=10000
-feign_faces_read_timeout=60000
+connection_timeout=10000
+read_timeout=60000
 ADMIN_VERSION=latest
 API_VERSION=latest
 FE_VERSION=latest

diff --git a/dev/docker-compose-gpu.yml b/dev/docker-compose-gpu.yml
@@ -67,8 +67,8 @@ services:
       - SAVE_IMAGES_TO_DB=${save_images_to_db}
       - MAX_FILE_SIZE=${max_file_size}
       - MAX_REQUEST_SIZE=${max_request_size}B
-      - FEIGN_FACES_CONNECTION_TIMEOUT=${feign_faces_connection_timeout}
-      - FEIGN_FACES_READ_TIMEOUT=${feign_faces_read_timeout}
+      - CONNECTION_TIMEOUT=${connection_timeout}
+      - READ_TIMEOUT=${read_timeout}
 
   compreface-fe:
     image: ${registry}compreface-fe:${FE_VERSION}

diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
@@ -70,8 +70,8 @@ services:
       - SAVE_IMAGES_TO_DB=${save_images_to_db}
       - MAX_FILE_SIZE=${max_file_size}
       - MAX_REQUEST_SIZE=${max_request_size}B
-      - FEIGN_FACES_CONNECTION_TIMEOUT=${feign_faces_connection_timeout}
-      - FEIGN_FACES_READ_TIMEOUT=${feign_faces_read_timeout}
+      - CONNECTION_TIMEOUT=${connection_timeout}
+      - READ_TIMEOUT=${read_timeout}
 
   compreface-fe:
     image: ${registry}compreface-fe:${FE_VERSION}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -51,8 +51,8 @@ services:
       - SAVE_IMAGES_TO_DB=${save_images_to_db}
       - MAX_FILE_SIZE=${max_file_size}
       - MAX_REQUEST_SIZE=${max_request_size}B
-      - FEIGN_FACES_CONNECTION_TIMEOUT=${feign_faces_connection_timeout}
-      - FEIGN_FACES_READ_TIMEOUT=${feign_faces_read_timeout}
+      - CONNECTION_TIMEOUT=${connection_timeout}
+      - READ_TIMEOUT=${read_timeout}
 
   compreface-fe:
     restart: always

diff --git a/java/admin/src/main/resources/application.yml b/java/admin/src/main/resources/application.yml
@@ -19,10 +19,10 @@ app:
       url: https://api.appery.io/rest/1/db/collections
       api-key: ${APPERY_API_KEY:#{null}}
     faces:
-      connect-timeout: ${FEIGN_FACES_CONNECTION_TIMEOUT:10000}
-      read-timeout: ${FEIGN_FACES_READ_TIMEOUT:60000}
+      connect-timeout: ${CONNECTION_TIMEOUT:10000}
+      read-timeout: ${READ_TIMEOUT:60000}
       retryer:
-        max-attempts: ${FEIGN_FACES_RETRYER_MAX_ATTEMPTS:1}
+        max-attempts: ${MAX_ATTEMPTS:1}
 
 spring:
   profiles:

diff --git a/java/admin/src/test/resources/application.yml b/java/admin/src/test/resources/application.yml
@@ -19,10 +19,10 @@ app:
       url: https://localhost/rest/1/db/collections
       api-key: ${APPERY_API_KEY:#{null}}
     faces:
-      connect-timeout: ${FEIGN_FACES_CONNECTION_TIMEOUT:10000}
-      read-timeout: ${FEIGN_FACES_READ_TIMEOUT:60000}
+      connect-timeout: ${CONNECTION_TIMEOUT:10000}
+      read-timeout: ${READ_TIMEOUT:60000}
       retryer:
-        max-attempts: ${FEIGN_FACES_RETRYER_MAX_ATTEMPTS:1}
+        max-attempts: ${MAX_ATTEMPTS:1}
 
 spring:
   servlet:

diff --git a/java/api/src/main/resources/application.yml b/java/api/src/main/resources/application.yml
@@ -82,10 +82,10 @@ app:
       url: https://api.appery.io/rest/1/db/collections
       api-key: ${APPERY_API_KEY:#{null}}
     faces:
-      connect-timeout: ${FEIGN_FACES_CONNECTION_TIMEOUT:10000}
-      read-timeout: ${FEIGN_FACES_READ_TIMEOUT:60000}
+      connect-timeout: ${CONNECTION_TIMEOUT:10000}
+      read-timeout: ${READ_TIMEOUT:60000}
       retryer:
-        max-attempts: ${FEIGN_FACES_RETRYER_MAX_ATTEMPTS:1}
+        max-attempts: ${MAX_ATTEMPTS:1}
 
 ---
 

diff --git a/java/api/src/test/resources/application.yml b/java/api/src/test/resources/application.yml
@@ -48,10 +48,10 @@ app:
       url: https://localhost/rest/1/db/collections
       api-key: ${APPERY_API_KEY:#{null}}
     faces:
-      connect-timeout: ${FEIGN_FACES_CONNECTION_TIMEOUT:10000}
-      read-timeout: ${FEIGN_FACES_READ_TIMEOUT:60000}
+      connect-timeout: ${CONNECTION_TIMEOUT:10000}
+      read-timeout: ${READ_TIMEOUT:60000}
       retryer:
-        max-attempts: ${FEIGN_FACES_RETRYER_MAX_ATTEMPTS:1}
+        max-attempts: ${MAX_ATTEMPTS:1}
 
 statistic:
   model: