nl-7 ol-7"> 7
+app.autodiscover_tasks()

+ 12 - 1
app/network_report/settings.py

@@ -24,7 +24,7 @@ env = environ.Env()
24 24
 environ.Env.read_env()
25 25
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
26 26
 BASE_DIR = Path(__file__).resolve().parent.parent
27
-
27
+from celery.schedules import crontab
28 28
 
29 29
 # Quick-start development settings - unsuitable for production
30 30
 # See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/
@@ -192,3 +192,14 @@ YARN_INSTALLED_APPS = (
192 192
     'tailwind-color-palette', 
193 193
     'paper-css'
194 194
 )
195
+
196
+
197
+CELERY_BEAT_SCHEDULE = {
198
+    # "dumpapi": {
199
+        # "task": "backend.views.dump_api_task",
200
+        #"schedule": crontab(minute="*/1"),
201
+        # "schedule": crontab(minute="*/30"),
202
+        # "schedule": crontab(hour="17", minute="15"),
203
+        # "schedule": crontab(hour="*/1"),
204
+    # },
205
+}

+ 1 - 1
app/worker-entrypoint.sh

@@ -1,3 +1,3 @@
1 1
 #!/bin/bash
2
-celery -A kacee worker -B  -l info
2
+celery -A network_report worker -B  -l info
3 3
 #celery -A kacee beat --detach -l info

+ 29 - 29
docker-compose.yml

@@ -5,7 +5,7 @@ services:
5 5
     ports:
6 6
       - "6379"
7 7
   db:
8
-    image: postgres
8
+    image: postgres:15.5-alpine3.19
9 9
     volumes:
10 10
       - ./data/db:/var/lib/postgresql/data
11 11
     ports:
@@ -17,7 +17,7 @@ services:
17 17
   mongodb:
18 18
     image: mongo:6-jammy
19 19
     ports:
20
-      - '27017'
20
+      - '27017:27017'
21 21
     volumes:
22 22
       - ./mongodb:/data/db
23 23
   web:
@@ -43,24 +43,24 @@ services:
43 43
       - db
44 44
       - redis
45 45
       #- rabbitmq
46
-  #worker:
47
-    #restart: unless-stopped
48
-    ##build: .
49
-    #image: tum/network-report-image
50
-    ##command: python -X dev manage.py  runserver 0.0.0.0:8000
51
-    #entrypoint: ./worker-entrypoint.sh
52
-    #volumes:
53
-      #- ./app:/code
54
-      #- ./media:/code/media
55
-    #environment:
56
-      #- POSTGRES_NAME=postgres
57
-      #- POSTGRES_USER=postgres
58
-      #- POSTGRES_PASSWORD=postgres
59
-      #- PYTHONMALLOC=debug
60
-      #- DJANGO_SETTINGS_MODULE=kacee.settings
61
-      #- MODE=${MODE}
62
-    #depends_on:
63
-      #- web
46
+  worker:
47
+    restart: unless-stopped
48
+    #build: .
49
+    image: tum/network-report-image
50
+    #command: python -X dev manage.py  runserver 0.0.0.0:8000
51
+    entrypoint: ./worker-entrypoint.sh
52
+    volumes:
53
+      - ./app:/code
54
+      - ./media:/code/media
55
+    environment:
56
+      - POSTGRES_NAME=postgres
57
+      - POSTGRES_USER=postgres
58
+      - POSTGRES_PASSWORD=postgres
59
+      - PYTHONMALLOC=debug
60
+      - DJANGO_SETTINGS_MODULE=network_report.settings
61
+      - MODE=${MODE}
62
+    depends_on:
63
+      - web
64 64
   #websocket:
65 65
     ##build: .
66 66
     #image: tum/network-report-image
@@ -79,14 +79,14 @@ services:
79 79
     #depends_on:
80 80
       #- db
81 81
       #- redis
82
-  #rabbitmq:
83
-    #image: rabbitmq:3-management-alpine
84
-    #container_name: 'rabbitmq'
85
-    #ports:
86
-      #- "127.0.0.1:5672:5672"
87
-      #- "127.0.0.1:15672:15672"
88
-    #volumes:
89
-        #- ./rabbitmq/data/:/var/lib/rabbitmq/
90
-        #- ./rabbitmq/log/:/var/log/rabbitmq
82
+  rabbitmq:
83
+    image: rabbitmq:3-management-alpine
84
+    container_name: 'rabbitmq3'
85
+    ports:
86
+      - "5672:5672"
87
+      - "15672:15672"
88
+    volumes:
89
+        - ./rabbitmq/data/:/var/lib/rabbitmq/
90
+        - ./rabbitmq/log/:/var/log/rabbitmq
91 91
     #networks:
92 92
         #- rabbitmq_go_net

Datei-Diff unterdrückt, da er zu groß ist
+ 5659 - 0
network.ipynb


BIN
ping_test.xlsx


+ 1 - 1
requirements.txt

@@ -38,7 +38,7 @@ django-formset
38 38
 django-multiselectfield
39 39
 django_ace
40 40
 django-autoslug
41
-celery==5.2.7
41
+celery
42 42
 django-phonenumber-field[phonenumbers]
43 43
 django-credit-cards
44 44
 django-payments[stripe]

BIN
table.xlsx


BIN
table1703516489.xlsx


BIN
table2.xlsx


BIN
table3.xlsx


BIN
test.xlsx


BIN
~$table1703516489.xlsx


BIN
~$table3.xlsx


tum/fm99-app-rev - Gogs: Simplico Git Service

23 Commitit (master)

Tekijä SHA1 Viesti Päivämäärä
  golf 8f40d05b3f edit hone + news-detail 3 vuotta sitten
  golf 23df0fefbe add new json 3 vuotta sitten
  tum c4daef72b2 integrate service 3 vuotta sitten
  tum 17a40166d1 android platform 3 vuotta sitten
  tum 1469410df6 Merge branch 'master' of http://git2.simplico.net/tum/fm99-app-rev 3 vuotta sitten
  tum 2fc87d26a0 golf finish 3 vuotta sitten
  golf c08efd8ac8 ngif news detail 3 vuotta sitten
  golf c1b9c54d62 design 11-11-22 3 vuotta sitten
  golf 83c14ce5b7 load youtube api in page 3 vuotta sitten
  golf 1abbf1e696 buil cap ios 3 vuotta sitten
  golf 0e6c985a54 ignore 3 vuotta sitten
  golf 960f5d453b save 3 vuotta sitten
  golf b2f75d24ec golf first pull 3 vuotta sitten
  golf f7660536a2 youtube api 3 vuotta sitten
  tum 06e4cee796 ios www 3 vuotta sitten
  golf d20b372aff home load news 3 vuotta sitten
  golf 0bc8750e2a fixed news detail show title 3 vuotta sitten
  golf 79cd78c117 load news detail 3 vuotta sitten
  golf 563744429f load api news page 3 vuotta sitten
  golf 5f33a84090 add rout home+news 3 vuotta sitten
  golf da35d5590a edit page 3 vuotta sitten
  golf 3d449d131d First Push 3 vuotta sitten
  tum c68646ade9 first commit 3 vuotta sitten