From 833c822b3363a283f53e2e2ca20dbe5e227284ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Wed, 28 May 2025 15:29:06 +0300 Subject: [PATCH 1/2] Update github action file --- .github/workflows/production_pull_code.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/production_pull_code.yml b/.github/workflows/production_pull_code.yml index 1384dbbf9..6254be019 100644 --- a/.github/workflows/production_pull_code.yml +++ b/.github/workflows/production_pull_code.yml @@ -26,7 +26,7 @@ jobs: run: | echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" mkdir -p ~/master_branch_sha - echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/} + echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/} sudo chmod +x ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh sudo ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_PROJECT_USER }} ${{ secrets.CYBER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }} @@ -40,7 +40,7 @@ jobs: run: | echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" mkdir -p ~/master_branch_sha - echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/} + echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/} sudo chmod +x ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh sudo ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }} ${{ secrets.ENSAN_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }} @@ -54,7 +54,7 @@ jobs: run: | echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" mkdir -p ~/master_branch_sha - echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/} + echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/} sudo chmod +x ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh sudo ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }} ${{ secrets.HELPDESK_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }} @@ -68,7 +68,7 @@ jobs: run: | echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" mkdir -p ~/master_branch_sha - echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/} + echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/} sudo chmod +x ${{ secrets.KAZ_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh sudo ${{ secrets.KAZ_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.KAZ_PROJECT_USER }} ${{ secrets.KAZ_STANDARD_FOLDER_PATH }} ${{ secrets.KAZ_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }} sudo systemctl restart odoo-server-stage.service @@ -83,7 +83,7 @@ jobs: run: | echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" mkdir -p ~/master_branch_sha - echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/} + echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/} sudo chmod +x ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh sudo ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.TWAHOD_PROJECT_USER }} ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }} ${{ secrets.TWAHOD_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }} @@ -97,7 +97,7 @@ jobs: run: | echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" mkdir -p ~/master_branch_sha - echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/} + echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/} sudo chmod +x ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh sudo ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.EKRAM_PROJECT_USER }} ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }} ${{ secrets.EKRAM_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }} From 043c9c209e8a649b6260759bd8c57db0dce73ab9 Mon Sep 17 00:00:00 2001 From: Samir Ladoui Date: Wed, 28 May 2025 14:47:43 +0100 Subject: [PATCH 2/2] [UPD] odex_mobile --- .../controllers/rest_api_v2/authentication.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py b/odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py index 7dd00297d..e6d1244d3 100644 --- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py +++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py @@ -13,6 +13,7 @@ from ...http_helper import http_helper from ...data_util import data_util import json import logging +import time from odoo.tools.translate import _ _logger = logging.getLogger(__name__) @@ -24,12 +25,17 @@ class AuthenticationController(http.Controller): @http.route('/rest_api/validate',type='http', auth='none', csrf=False, cors='*',methods=['POST']) def validate_token(self, **kw): + start_time_pc = time.perf_counter() http_method, body, headers, token = http_helper.parse_request() result = validator.validate_token(token) + _logger.info("DEBUG VALIDATION: %s", result) if result['code'] == 497 or result['code'] == 498: return http_helper.errcode(code=result['code'], message=result['message']) + end_time_pc = time.perf_counter() + execution_time_pc = end_time_pc - start_time_pc + _logger.info("TIME VALIDATION API: %s seconds", execution_time_pc) return http_helper.response(message="uploaded success",data=result['data']) @http.route('/rest_api/refresh',type='http', auth='none', csrf=False, cors='*',methods=['POST']) @@ -210,6 +216,7 @@ class AuthenticationController(http.Controller): @http.route('/rest_api/login', type='http', auth='none', csrf=False, cors='*', methods=['POST']) def login_phone(self, **kw): + start_time_pc = time.perf_counter() login=kw.get('login') password=kw.get('password') if not login : @@ -244,5 +251,8 @@ class AuthenticationController(http.Controller): dic['token'] = token dic['is_approve'] = 'group_division_manager' in dic.get('groups',[]) - http_helper.cleanup(); + http_helper.cleanup() + end_time_pc = time.perf_counter() + execution_time_pc = end_time_pc - start_time_pc + _logger.info("TIME LOGIN API: %s seconds", execution_time_pc) return http_helper.response(data=dic, message=_("User log in successfully"))