some changes to new backend

vivoit00 · Apr 29, 2024 · 9e949a3 · 9e949a3
1 parent b23f14a
commit 9e949a3
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 163 deletions.
diff --git a/sample/otel-in-action/docker-compose.yaml b/sample/otel-in-action/docker-compose.yaml
@@ -39,16 +39,16 @@ services:
 # depends_on:
 # - postgresdb
 
- todobackend-django: #NICHT FERTIG
- image: #WHAT IS DIS
- networks:
- - todonet
+ todobackend-django:
  build:
  context: ./todobackend_django
  dockerfile: Dockerfile
+ networks:
+ - todonet
  ports:
- - "8080:8080"
- restart: unless stopped
+ - "8000:8000" 
+ restart: unless-stopped
+
 
  todoui-thymeleaf:
  image: todoui:otel

diff --git a/sample/otel-in-action/todobackend_django/Dockerfile b/sample/otel-in-action/todobackend_django/Dockerfile
@@ -0,0 +1 @@
+# python manage.py runserver 8080 muss glaub rein oder so
diff --git a/sample/otel-in-action/todobackend_django/manage.py b/sample/otel-in-action/todobackend_django/manage.py
@@ -6,7 +6,7 @@
 
 def main():
  """Run administrative tasks."""
- os.environ.setdefault("DJANGO_SETTINGS_MODULE", "todo_project.settings")
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "todobackend_django.settings")
  try:
  from django.core.management import execute_from_command_line
  except ImportError as exc:

diff --git a/sample/otel-in-action/todobackend_django/todo_project/settings.py b/sample/otel-in-action/todobackend_django/todo_project/settings.py
diff --git a/sample/otel-in-action/todobackend_django/todo_project/urls.py b/sample/otel-in-action/todobackend_django/todo_project/urls.py
diff --git a/...dobackend_django/todo_project/__init__.py → ...end_django/todobackend_django/__init__.py b/...dobackend_django/todo_project/__init__.py → ...end_django/todobackend_django/__init__.py
diff --git a/...n/todobackend_django/todo_project/asgi.py → ...backend_django/todobackend_django/asgi.py b/...n/todobackend_django/todo_project/asgi.py → ...backend_django/todobackend_django/asgi.py
@@ -1,5 +1,5 @@
 """
-ASGI config for todo_project project.
+ASGI config for todobackend_django project.
 
 It exposes the ASGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "todo_project.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "todobackend_django.settings")
 
 application = get_asgi_application()
diff --git a/sample/otel-in-action/todobackend_django/todobackend_django/settings.py b/sample/otel-in-action/todobackend_django/todobackend_django/settings.py
@@ -0,0 +1,16 @@
+from django.core.management.utils import get_random_secret_key
+
+ALLOWED_HOSTS = ['*']
+
+ROOT_URLCONF = 'todobackend_django.urls' 
+
+SECRET_KEY = get_random_secret_key()
+
+INSTALLED_APPS = [
+
+ 'rest_framework',
+ 'todos',
+
+]
+
+#DATABASES: {}
diff --git a/...n-action/todobackend_django/todos/urls.py → ...backend_django/todobackend_django/urls.py b/...n-action/todobackend_django/todos/urls.py → ...backend_django/todobackend_django/urls.py
diff --git a/...n/todobackend_django/todo_project/wsgi.py → ...backend_django/todobackend_django/wsgi.py b/...n/todobackend_django/todo_project/wsgi.py → ...backend_django/todobackend_django/wsgi.py
@@ -1,5 +1,5 @@
 """
-WSGI config for todo_project project.
+WSGI config for todobackend_django project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "todo_project.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "todobackend_django.settings")
 
 application = get_wsgi_application()
diff --git a/sample/otel-in-action/todobackend_django/todos/settings.py b/sample/otel-in-action/todobackend_django/todos/settings.py