From 830c7b7616931db04e01a7216415cccb0044c625 Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Wed, 14 Dec 2022 14:24:36 +0000 Subject: [PATCH 1/4] add links to test --- docker-compose.test.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 585b6c81..c37dcf8d 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -57,12 +57,12 @@ services: image: docker.fet.at/fet2020django container_name: test_fet2020 environment: - HOST_NAME: "test.fet.at" - DEBUG: "False" - SECRET_KEY: "sadfreigjopi4qgjpjrp" - MYSQL_USER: "user" - MYSQL_PASSWORD: "hgu" - ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3" + HOST_NAME: "test.fet.at" + DEBUG: "False" + SECRET_KEY: "sadfreigjopi4qgjpjrp" + MYSQL_USER: "user" + MYSQL_PASSWORD: "hgu" + ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3" depends_on: mysql: condition: service_healthy @@ -73,6 +73,8 @@ services: volumes: - /srv/APIKEY.txt:/app/etherpad/APIKEY.txt - /srv/files:/app/files + links: + - "mysql:database" volumes: ep-mysql-volume: driver: local From 5d0a31d7f063ea4b6f19cc96fc67c17d9b4dbcd3 Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Wed, 14 Dec 2022 15:02:57 +0000 Subject: [PATCH 2/4] delete links and add ports --- docker-compose.test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index c37dcf8d..19ad1ada 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -3,6 +3,8 @@ services: mysql: image: mariadb container_name: test_mysql + ports: + - "3306:3306" environment: MYSQL_DATABASE: fet2020db MYSQL_USER: user @@ -73,8 +75,6 @@ services: volumes: - /srv/APIKEY.txt:/app/etherpad/APIKEY.txt - /srv/files:/app/files - links: - - "mysql:database" volumes: ep-mysql-volume: driver: local From 131b5580c427bf20bf0f5d8a0619589824704475 Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Sat, 17 Dec 2022 20:37:06 +0000 Subject: [PATCH 3/4] change volumes --- docker-compose.test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 19ad1ada..5169dab1 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -13,8 +13,8 @@ services: MYSQL_CHARSET: utf8 MYSQL_ALLOW_EMPTY_PASSWORD: "yes" volumes: - - mysql-volume:/var/lib/mysql - - /srv/initdb/mysql:/docker-entrypoint-initdb.d/ + #- mysql-volume:/var/lib/mysql + - /srv/initdb/mysql:/docker-entrypoint-initdb.d/ healthcheck: test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] timeout: 20s @@ -30,8 +30,8 @@ services: MYSQL_CHARSET: utf8 MYSQL_ALLOW_EMPTY_PASSWORD: "yes" volumes: - - ep-mysql-volume:/var/lib/mysql - - /srv/initdb/etherpad:/docker-entrypoint-initdb.d/ + #- ep-mysql-volume:/var/lib/mysql + - /srv/initdb/etherpad:/docker-entrypoint-initdb.d/ etherpad: image: etherpad/etherpad container_name: test_etherpad From a3f9965d8730c39eb7d863d3fad2d0ba79103780 Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Sat, 17 Dec 2022 22:06:20 +0000 Subject: [PATCH 4/4] add logging --- ...r_task_options_task_slug_task_slug_id_and_more.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/fet2020/tasks/migrations/0002_alter_task_options_task_slug_task_slug_id_and_more.py b/fet2020/tasks/migrations/0002_alter_task_options_task_slug_task_slug_id_and_more.py index 2f1ed4b4..32481649 100644 --- a/fet2020/tasks/migrations/0002_alter_task_options_task_slug_task_slug_id_and_more.py +++ b/fet2020/tasks/migrations/0002_alter_task_options_task_slug_task_slug_id_and_more.py @@ -1,11 +1,16 @@ # Generated by Django 4.0.6 on 2022-07-30 10:47 import datetime +import logging + +import fet2020.utils + from django.db import migrations, models import django.db.models.deletion import django.db.models.expressions from django.utils.text import slugify -import fet2020.utils + +logger = logging.getLogger(__name__) def forwards_func(apps, schema_editor): @@ -13,6 +18,11 @@ def forwards_func(apps, schema_editor): for elem in Tasks.objects.all(): elem.slug_id = fet2020.utils.create_random_id() elem.slug = elem.slug_id + "-" + slugify(elem.title) + + logger.info(f"Task: {elem}") + logger.info(f"Slug ID: {elem.slug_id}") + logger.info(f"Slug: {elem.slug}") + elem.save() TaskLists = apps.get_model("tasks", "TaskList")