From 8cc58e0e57c483caddc07f5ed435cb4ffa2b3cb5 Mon Sep 17 00:00:00 2001 From: Avi Date: Mon, 23 Jan 2023 23:51:17 +0200 Subject: [PATCH 01/17] buildPipelin --- Jenkinsfile_start | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/Jenkinsfile_start b/Jenkinsfile_start index c965622..2c3c29d 100644 --- a/Jenkinsfile_start +++ b/Jenkinsfile_start @@ -1,35 +1,20 @@ pipeline { - agent { - node { - label 'python' - } - } - triggers { - pollSCM '*/5 * * * *' - } + agent any + stages { - stage('Build') { + stage('Checkout') { steps { - echo "Building.." - sh ''' - echo "doing build stuff.." - ''' + echo 'ADI !' + + checkout scmGit(branches: [[name: '*/DevRabbit']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/avico78/ADI.git']]) } } - stage('Test') { - steps { - echo "Testing.." - sh ''' - echo "doing test stuff.." - ''' - } - } - stage('Deliver') { + stage('Build') { steps { - echo 'Deliver....' - sh ''' - echo "doing delivery stuff.." - ''' + git branch: 'DevRabbit', url: 'https://github.com/avico78/ADI.git' + pip install -r requirements.txt + cd app_config + python3 settings.py } } } From 11161e84363a99038394b4484c7f0e842ff40133 Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 24 Jan 2023 10:27:42 +0200 Subject: [PATCH 02/17] buildPipelin --- Dockerfile | 25 +++++++++++++++++++++++++ Jenkinsfile_start | 21 +++++++++++++++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..af38ea0 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,25 @@ +FROM python:3.10-alpine + +WORKDIR /usr/src + +# ① Install some dependencies +RUN apt-get update \ + && apt-get install -y libsasl2-dev python-dev libldap2-dev libssl-dev \ + && rm -rf /var/lib/apt/lists/* + +# ② Copy the setup script +ADD . + + +# ③ Make sure some dummy files are present for the setup script +RUN touch README.md +RUN mkdir scripts && touch scripts/ghcli + +# ④ Install the project dependencies to run the tests +RUN python -m pip install -e ".[test]" + +# ⑤ Copy the source code +COPY . . + +# ⑥ Volume when container is used as volume container +VOLUME /usr/src \ No newline at end of file diff --git a/Jenkinsfile_start b/Jenkinsfile_start index 2c3c29d..38444f9 100644 --- a/Jenkinsfile_start +++ b/Jenkinsfile_start @@ -1,15 +1,32 @@ pipeline { - agent any + agent none + environment { + PRODUCT = 'ADI' + GIT_HOST = 'somewhere' + GIT_REPO = 'repo' + } + options { + ansiColor('xterm') + skipDefaultCheckout() + buildDiscarder(logRotator(numToKeepStr: '10')) + } stages { stage('Checkout') { + + steps { + checkout scmGit(branches: [[name: '*/DevRabbit']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/avico78/ADI.git']]) + } steps { echo 'ADI !' - checkout scmGit(branches: [[name: '*/DevRabbit']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/avico78/ADI.git']]) } } stage('Build') { + agent { + docker { + image 'python:alpine' + } steps { git branch: 'DevRabbit', url: 'https://github.com/avico78/ADI.git' pip install -r requirements.txt From 69806f3dff1cd0d384a78145795e2b69dc973153 Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 24 Jan 2023 10:30:21 +0200 Subject: [PATCH 03/17] adding adi as root dir --- {app_config => adi/app_config}/config.yaml | 0 {app_config => adi/app_config}/customer.py | 0 {app_config => adi/app_config}/db_config.py | 6 ++---- {app_config => adi/app_config}/db_config_with_ABC.py | 1 - {app_config => adi/app_config}/settings.py | 2 +- {app_config => adi/app_config}/task.py | 0 {app_config => adi/app_config}/tasks_orchestrator.py | 0 main.py => adi/main.py | 8 +++----- {rules => adi/rules}/source_1.csv | 0 9 files changed, 6 insertions(+), 11 deletions(-) rename {app_config => adi/app_config}/config.yaml (100%) rename {app_config => adi/app_config}/customer.py (100%) rename {app_config => adi/app_config}/db_config.py (94%) rename {app_config => adi/app_config}/db_config_with_ABC.py (97%) rename {app_config => adi/app_config}/settings.py (96%) rename {app_config => adi/app_config}/task.py (100%) rename {app_config => adi/app_config}/tasks_orchestrator.py (100%) rename main.py => adi/main.py (84%) rename {rules => adi/rules}/source_1.csv (100%) diff --git a/app_config/config.yaml b/adi/app_config/config.yaml similarity index 100% rename from app_config/config.yaml rename to adi/app_config/config.yaml diff --git a/app_config/customer.py b/adi/app_config/customer.py similarity index 100% rename from app_config/customer.py rename to adi/app_config/customer.py diff --git a/app_config/db_config.py b/adi/app_config/db_config.py similarity index 94% rename from app_config/db_config.py rename to adi/app_config/db_config.py index 9ddaa38..9502217 100644 --- a/app_config/db_config.py +++ b/adi/app_config/db_config.py @@ -1,11 +1,9 @@ -from app_config.settings import SingletonMeta +from adi.app_config.settings import SingletonMeta from typing import Dict from enum import Enum from sqlalchemy import create_engine -from sqlalchemy.orm import sessionmaker -from sqlalchemy_utils import database_exists, create_database -from sqlalchemy.sql import text + class DBType(str, Enum): POSTGRES = "postgres" diff --git a/app_config/db_config_with_ABC.py b/adi/app_config/db_config_with_ABC.py similarity index 97% rename from app_config/db_config_with_ABC.py rename to adi/app_config/db_config_with_ABC.py index 219fab7..43f31d9 100644 --- a/app_config/db_config_with_ABC.py +++ b/adi/app_config/db_config_with_ABC.py @@ -1,4 +1,3 @@ -from app_config.settings import SingletonMeta from abc import ABC, abstractmethod from typing import Dict from enum import Enum diff --git a/app_config/settings.py b/adi/app_config/settings.py similarity index 96% rename from app_config/settings.py rename to adi/app_config/settings.py index 50e16eb..6fc5215 100644 --- a/app_config/settings.py +++ b/adi/app_config/settings.py @@ -35,7 +35,7 @@ def get(self, element): if __name__ == "__main__": # The client code. - config_file = Path('.', 'config.yaml') + config_file = Path('', 'config.yaml') s1 = Settings(config_file=config_file) print(s1.get('databases.mongo.ENGINE')) diff --git a/app_config/task.py b/adi/app_config/task.py similarity index 100% rename from app_config/task.py rename to adi/app_config/task.py diff --git a/app_config/tasks_orchestrator.py b/adi/app_config/tasks_orchestrator.py similarity index 100% rename from app_config/tasks_orchestrator.py rename to adi/app_config/tasks_orchestrator.py diff --git a/main.py b/adi/main.py similarity index 84% rename from main.py rename to adi/main.py index e132d2c..80d0d53 100644 --- a/main.py +++ b/adi/main.py @@ -1,9 +1,7 @@ -from app_config.settings import Settings -from app_config.db_config import DBContext -from app_config.task import Task -import os +from adi.app_config.settings import Settings +from adi.app_config.db_config import DBContext from pathlib import Path -config_file = Path('app_config','config.yaml') +config_file = Path('app_config', 'config.yaml') rules = 'application_conig.rules.' diff --git a/rules/source_1.csv b/adi/rules/source_1.csv similarity index 100% rename from rules/source_1.csv rename to adi/rules/source_1.csv From 6a5233b16286e54dc419eac25547dfbac614c7ae Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 24 Jan 2023 10:35:56 +0200 Subject: [PATCH 04/17] Setting Dockerfile --- Dockerfile | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index af38ea0..1d95528 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,25 +1,22 @@ FROM python:3.10-alpine -WORKDIR /usr/src +ENV PYTHONUNBUFFERED 1 + +WORKDIR /adi + +ADD requirements.txt /adi/ +RUN pip install --upgrade pip +RUN pip install -r requirements.txt # ① Install some dependencies RUN apt-get update \ && apt-get install -y libsasl2-dev python-dev libldap2-dev libssl-dev \ - && rm -rf /var/lib/apt/lists/* - -# ② Copy the setup script -ADD . - + && rm -rf /var/lib/apt/lists/* \ + && apt-get clean -# ③ Make sure some dummy files are present for the setup script -RUN touch README.md -RUN mkdir scripts && touch scripts/ghcli -# ④ Install the project dependencies to run the tests -RUN python -m pip install -e ".[test]" +# Copy adi +ADD /adi /adi -# ⑤ Copy the source code -COPY . . -# ⑥ Volume when container is used as volume container VOLUME /usr/src \ No newline at end of file From 6ad907c465d9fd811c269f529224cc50b9283e2a Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 24 Jan 2023 11:57:05 +0200 Subject: [PATCH 05/17] DockerHub --- Jenkinsfile_start | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile_start b/Jenkinsfile_start index 38444f9..9df4f9f 100644 --- a/Jenkinsfile_start +++ b/Jenkinsfile_start @@ -1,38 +1,38 @@ pipeline { - agent none + environment { + DOCKERHUB_CREDENTIALS = credentials('avicoiot-dockerhub') PRODUCT = 'ADI' GIT_HOST = 'somewhere' GIT_REPO = 'repo' } + agent { label 'linux'} options { ansiColor('xterm') skipDefaultCheckout() - buildDiscarder(logRotator(numToKeepStr: '10')) + buildDiscarder(logRotator(numToKeepStr: '3')) } stages { - stage('Checkout') { - - steps { - checkout scmGit(branches: [[name: '*/DevRabbit']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/avico78/ADI.git']]) - } + stage('Build') { steps { - echo 'ADI !' - checkout scmGit(branches: [[name: '*/DevRabbit']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/avico78/ADI.git']]) + sh 'docker build -t avicoiot/adi-alpine:latest .' + } } - } - stage('Build') { - agent { - docker { - image 'python:alpine' + stage('Login') { + steps { + sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -i $DOCKERHUB_CREDENTIALS_USR --password-stdin' + } } + stage('Push') { steps { - git branch: 'DevRabbit', url: 'https://github.com/avico78/ADI.git' - pip install -r requirements.txt - cd app_config - python3 settings.py + sh 'docker push avicoiot/adi-alpine:latest' + } } } + post { + always { + sh 'docker logout' + } } } From 98633b35c464ea0dfb08834193ebde919f4757d3 Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 24 Jan 2023 11:59:00 +0200 Subject: [PATCH 06/17] DockerHub --- Jenkinsfile_start => Jenkinsfile_Devstart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename Jenkinsfile_start => Jenkinsfile_Devstart (92%) diff --git a/Jenkinsfile_start b/Jenkinsfile_Devstart similarity index 92% rename from Jenkinsfile_start rename to Jenkinsfile_Devstart index 9df4f9f..10d537e 100644 --- a/Jenkinsfile_start +++ b/Jenkinsfile_Devstart @@ -31,8 +31,8 @@ pipeline { } } post { - always { - sh 'docker logout' + always { + sh 'docker logout' + } } - } } From c19956073b9ce4aed59b230c2b9ac1dc61d1075f Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 24 Jan 2023 12:01:09 +0200 Subject: [PATCH 07/17] DockerHub --- Jenkinsfile_Devstart | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile_Devstart b/Jenkinsfile_Devstart index 10d537e..bd6a757 100644 --- a/Jenkinsfile_Devstart +++ b/Jenkinsfile_Devstart @@ -9,8 +9,6 @@ pipeline { agent { label 'linux'} options { - ansiColor('xterm') - skipDefaultCheckout() buildDiscarder(logRotator(numToKeepStr: '3')) } stages { From 8efd47897a5c36ee8347c2cd5f2303498629a59e Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 24 Jan 2023 12:07:52 +0200 Subject: [PATCH 08/17] DockerHub --- Jenkinsfile_Devstart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_Devstart b/Jenkinsfile_Devstart index bd6a757..1735576 100644 --- a/Jenkinsfile_Devstart +++ b/Jenkinsfile_Devstart @@ -6,7 +6,7 @@ pipeline { GIT_HOST = 'somewhere' GIT_REPO = 'repo' } - agent { label 'linux'} + agent any options { buildDiscarder(logRotator(numToKeepStr: '3')) From 29fde759b70dedda5c0b85c3c6b66c19621b420a Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 24 Jan 2023 12:30:55 +0200 Subject: [PATCH 09/17] DockerHub --- Dockerfile | 2 +- requirements.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1d95528..e93f9be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-alpine +FROM python:3.10.2 ENV PYTHONUNBUFFERED 1 diff --git a/requirements.txt b/requirements.txt index ee08c5e..124ec7c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -pip==22.3.1 -setuptools==65.5.1 -wheel==0.38.4 +pip +setuptools +wheel sqlalchemy SQLAlchemy-Utils numpy From 19fdffa0025322e90a85061e622255536edbe151 Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 24 Jan 2023 12:37:21 +0200 Subject: [PATCH 10/17] DockerHub --- Jenkinsfile_Devstart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_Devstart b/Jenkinsfile_Devstart index 1735576..29e1106 100644 --- a/Jenkinsfile_Devstart +++ b/Jenkinsfile_Devstart @@ -19,7 +19,7 @@ pipeline { } stage('Login') { steps { - sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -i $DOCKERHUB_CREDENTIALS_USR --password-stdin' + sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login --user $DOCKERHUB_CREDENTIALS_USR --password-stdin' } } stage('Push') { From e59d0c48bd3aed29da9acd0f3e87e64c4c654425 Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 24 Jan 2023 12:39:09 +0200 Subject: [PATCH 11/17] DockerHub --- Jenkinsfile_Devstart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_Devstart b/Jenkinsfile_Devstart index 29e1106..be2d3be 100644 --- a/Jenkinsfile_Devstart +++ b/Jenkinsfile_Devstart @@ -19,7 +19,7 @@ pipeline { } stage('Login') { steps { - sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login --user $DOCKERHUB_CREDENTIALS_USR --password-stdin' + sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login --username $DOCKERHUB_CREDENTIALS_USR --password-stdin' } } stage('Push') { From 31cde0646a9933002e40cd3b9c95dd049dee0631 Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 24 Jan 2023 13:27:57 +0200 Subject: [PATCH 12/17] step 0 --- .version | 1 + RN.md | 0 requirements.txt | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .version create mode 100644 RN.md diff --git a/.version b/.version new file mode 100644 index 0000000..d1c6331 --- /dev/null +++ b/.version @@ -0,0 +1 @@ +0.01 \ No newline at end of file diff --git a/RN.md b/RN.md new file mode 100644 index 0000000..e69de29 diff --git a/requirements.txt b/requirements.txt index 124ec7c..5ae2e10 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,5 @@ numpy pandas python-decouple pyyaml -psycopg2 \ No newline at end of file +psycopg2 +celery From bc8c5caee7621c4ad965d79048e5fb4991cacfd6 Mon Sep 17 00:00:00 2001 From: AvIot Date: Tue, 24 Jan 2023 16:21:51 +0200 Subject: [PATCH 13/17] asdasd --- adi/app_config/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adi/app_config/settings.py b/adi/app_config/settings.py index 6fc5215..50e16eb 100644 --- a/adi/app_config/settings.py +++ b/adi/app_config/settings.py @@ -35,7 +35,7 @@ def get(self, element): if __name__ == "__main__": # The client code. - config_file = Path('', 'config.yaml') + config_file = Path('.', 'config.yaml') s1 = Settings(config_file=config_file) print(s1.get('databases.mongo.ENGINE')) From a35b2035a0d2666f85c1906265c0631e6a29f44f Mon Sep 17 00:00:00 2001 From: avico78 Date: Tue, 24 Jan 2023 17:31:12 +0200 Subject: [PATCH 14/17] HL_design.drawio --- Untitled Diagram.drawio | 1 + 1 file changed, 1 insertion(+) create mode 100644 Untitled Diagram.drawio diff --git a/Untitled Diagram.drawio b/Untitled Diagram.drawio new file mode 100644 index 0000000..978c3f2 --- /dev/null +++ b/Untitled Diagram.drawio @@ -0,0 +1 @@ +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 \ No newline at end of file From 4e5e174bf823c8e37eb5dcecaf700366a80dfb6c Mon Sep 17 00:00:00 2001 From: avico78 Date: Tue, 24 Jan 2023 17:38:20 +0200 Subject: [PATCH 15/17] ADI.drawio --- Untitled Diagram.drawio | 270 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 269 insertions(+), 1 deletion(-) diff --git a/Untitled Diagram.drawio b/Untitled Diagram.drawio index 978c3f2..ce7f63d 100644 --- a/Untitled Diagram.drawio +++ b/Untitled Diagram.drawio @@ -1 +1,269 @@ -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 \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 21e8ed543731d67c99fe9f1128a156c9d42f0da2 Mon Sep 17 00:00:00 2001 From: avico78 Date: Tue, 24 Jan 2023 17:43:10 +0200 Subject: [PATCH 16/17] HL.drawio --- Untitled Diagram.drawio | 270 +--------------------------------------- 1 file changed, 1 insertion(+), 269 deletions(-) diff --git a/Untitled Diagram.drawio b/Untitled Diagram.drawio index ce7f63d..4b20a0e 100644 --- a/Untitled Diagram.drawio +++ b/Untitled Diagram.drawio @@ -1,269 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +UzV2zq1wL0osyPDNT0nNUTV2VTV2LsrPL4GwciucU3NyVI0MMlNUjV1UjYwMgFjVyA2HrCFY1qAgsSg1rwSLBiADYTaQg2Y1AA== \ No newline at end of file From 4712d7947b5c4b4f4d25d9ad352ca2b84908391d Mon Sep 17 00:00:00 2001 From: AvIot Date: Mon, 20 Feb 2023 15:19:11 +0200 Subject: [PATCH 17/17] n --- rabbitmq/celery_test/main.py | 2 +- .../proj/__pycache__/__init__.cpython-310.pyc | Bin 176 -> 148 bytes .../proj/__pycache__/celery.cpython-310.pyc | Bin 489 -> 461 bytes .../proj/__pycache__/tasks.cpython-310.pyc | Bin 763 -> 800 bytes rabbitmq/celery_test/proj/tasks.py | 20 ++++++++---- rabbitmq/celery_test/test_celery_proj.py | 30 ++++++++++++------ 6 files changed, 36 insertions(+), 16 deletions(-) diff --git a/rabbitmq/celery_test/main.py b/rabbitmq/celery_test/main.py index ac4033a..68f6510 100644 --- a/rabbitmq/celery_test/main.py +++ b/rabbitmq/celery_test/main.py @@ -1,3 +1,3 @@ -from tasks import add +from proj.tasks import add result = add.delay(4, 4) result.get(propagate=False) \ No newline at end of file diff --git a/rabbitmq/celery_test/proj/__pycache__/__init__.cpython-310.pyc b/rabbitmq/celery_test/proj/__pycache__/__init__.cpython-310.pyc index 3ce5695e53228d92da7fce3955f104b2a90091e5..ccad02905c2fbc987a7565ece81fe34b7edff236 100644 GIT binary patch delta 68 zcmdnMIE9frpO=@50SK->JwK7#M%P?FBR@A)Kd~%RKQSd!-_gZWzbG*&DYGQEP(L{} WC$*?Dz9hA{M8BXYKTCh&1O))px)%5V delta 96 zcmbQjxPg&7pO=@50SJPhpP9&Q;~DI16%$&VT2vg9SeBWbALE~w>Qay yUl3E8lA2o?<5-p%rr=pA|E)L;(O6b0X0I diff --git a/rabbitmq/celery_test/proj/__pycache__/celery.cpython-310.pyc b/rabbitmq/celery_test/proj/__pycache__/celery.cpython-310.pyc index 4fc7e53ac3f35ef43d319d88e9ef2ca0dc3cc2b5..7bd48e7981fd599bb9188ac9ccda477fb0e863d8 100644 GIT binary patch delta 72 zcmaFKe3qFvpO=@50SK->J)fMrkvE=E*Hk|vKQ~oBu`E+RF(p&q(Zy50C^0E1vn01r aKRGogwWu<_B(=Cizn~~TOMmiKMiT&5xER0y delta 100 zcmX@h{F0eBpO=@50SJ=6pGmIT$Q#e-8JKJp6Iz^FR2-97mYJL%47NGmHD@W_m8QYAL6QV<%>GnJ_HyVycC4qm3l!OMe}t4Z)C!7J1>c!ips ziuu7Fh;|M>uKRvZQ0%~u2BURPmzk=acCFR($fqZ|X>DzM{z<#0yKs8#nu!0n5yq_V zNr#NgmAHaqaY`8%JF$yAtUYXyrxDDbSLNr<>axCU%UZSNyOR$k*2`tA{sfcITz5hcCm+enW*Sl`;i$Whoxe@&7uGs16+8Qsd+fg>q)(`q-|_69T_O;s_53 zH$0tNVf?5;M=fsQCNa-&SXnyKi38B^hE%`u6OyHvf{PbludZc|lP_LMDqONWf!)i}}1gh5Z<|6+h^w-5WlS(7gq#PM-XAz1t~BHLu0KJ*|&>y$(`@m-7~S}ROSVE zgQU#E@B-ITrKUilVrDH+!bmgweS3TJ^G(t1b{N{P*7xLFz}OEWw~Zrtg>K(tP)tF_ za+m@z6)2tsIiGTmMJ94F6~Hu{HdI43zp^b%o1V2)=vm9Nw(58ms=Wz|qZ`1)G1Pok zmNy6qH*BVLi6B%nr(K%s1bh2u0ulKT-9E?Q*d<)Ci(nI61`4j=f;+B)4c`X95b+J$ zz!v+Y^C`osV!RIfuMhig4*Qe!lflk&$u=jE;jt>rwVqqFsq2`O?OC4Hg zK2bY$qcrKl#iEAu8dj!>Po`0_`~QSqTr;zWm%rZ)59LRzjg_-yniTTwLXS+k)N-Wl znJY?JDV?w6V42Fn=vbQBe4e`evrKfR&FaKy>ttz)Q|V^*%swkuD3nrE&(h*T-hmE8 z5Q6C%T qf<*9x`hNURxAKzU#&;jS$O~0v`iQ!;4=_Y5LYV~0CEDm>AN~OBf1J4h diff --git a/rabbitmq/celery_test/proj/tasks.py b/rabbitmq/celery_test/proj/tasks.py index 8395839..599b3b2 100644 --- a/rabbitmq/celery_test/proj/tasks.py +++ b/rabbitmq/celery_test/proj/tasks.py @@ -1,15 +1,16 @@ from .celery import app from time import sleep from datetime import datetime +from decimal import Decimal,getcontext @app.task def add(x, y): - - now = datetime.now() - current_time = now.strftime("%H:%M:%S") - print("AAAAAAA Current Time =", current_time) - print("I-->", x ,y ) + # sleep(10) + # now = datetime.now() + # current_time = now.strftime("%H:%M:%S") + # print("Current Time =", current_time) + # print( x , "New -->" ) return x + y @@ -23,9 +24,16 @@ def xsum(numbers): return sum(numbers) +@app.task +def pi_calc(): + sleep(1) + pi_val = 100 + return pi_val + + # adding watchdog - enable refersh with every change -#watchmedo auto-restart --directory=./proj --pattern=*.py --recursive -- celery -A proj worker --concurrency=1 --loglevel=INFO --pool=solo +#watchdog auto-restart --directory=./proj --pattern=*.py --recursive -- celery -A proj worker --concurrency=1 --loglevel=INFO --pool=solo # execute regulary #celery -A proj worker --pool=solo -l INFO \ No newline at end of file diff --git a/rabbitmq/celery_test/test_celery_proj.py b/rabbitmq/celery_test/test_celery_proj.py index a1c9846..6a6b2db 100644 --- a/rabbitmq/celery_test/test_celery_proj.py +++ b/rabbitmq/celery_test/test_celery_proj.py @@ -1,20 +1,32 @@ -from proj.tasks import add -from celery import group +from proj.tasks import add,pi_calc +from celery import group,signature +from time import sleep + + +def mylink(num): + return num+100 + + + + +# res= pi_calc.delay() +# print(res.status) +# sleep(5) +# print(res.status,res.get()) -# s1 = add.signature((2, 2), countdown=2) -# res = s1.delay() -# -# print(res.get()) # print(add(21,34)) -# -for i in range(10): - print(add.apply_async((i, 2), queue='ZZ1Z')) + +for i in range(5): + print(add.apply_async((i, -9))) # # g = group(add.s(i,2) for i in range(10)) # print(g(10).get()) +# print(celery.chain(add.delay(1,3), +# mylink(2)).appl_async()) + # # g = group(add.s(i, i) for i in range(10))().get() #