Commit 33902d64 authored by Philippe Valfok's avatar Philippe Valfok

Adicionando django-rq para tarefas fora do contexto da aplicação, adicionando...

Adicionando django-rq para tarefas fora do contexto da aplicação, adicionando módulo para consumir a api da digitalocean, adicionando redis ao docker-compose para servir de message_broker nas tarefas em segundo plano
parent 3a3db5aa
...@@ -5,8 +5,9 @@ __pycache__/ ...@@ -5,8 +5,9 @@ __pycache__/
# C extensions # C extensions
*.so *.so
# Arquivos env # Arquivos env e ini
*.env *.env
*.ini
# Distribution / packaging # Distribution / packaging
.Python .Python
......
amqp==2.2.2
billiard==3.5.0.3
blessings==1.6.1 blessings==1.6.1
bpython==0.17 bpython==0.17
certifi==2018.1.18 certifi==2018.1.18
...@@ -6,6 +8,7 @@ click==6.7 ...@@ -6,6 +8,7 @@ click==6.7
curtsies==0.2.11 curtsies==0.2.11
dj-database-url==0.4.2 dj-database-url==0.4.2
Django==2.0.1 Django==2.0.1
django-rq==1.0.1
django-solo==1.1.3 django-solo==1.1.3
greenlet==0.4.12 greenlet==0.4.12
idna==2.6 idna==2.6
...@@ -16,8 +19,11 @@ python-decouple==3.1 ...@@ -16,8 +19,11 @@ python-decouple==3.1
python-digitalocean==1.13.2 python-digitalocean==1.13.2
python-dotenv==0.7.1 python-dotenv==0.7.1
pytz==2017.3 pytz==2017.3
redis==2.10.6
requests==2.18.4 requests==2.18.4
rq==0.10.0
six==1.11.0 six==1.11.0
Unipath==1.1 Unipath==1.1
urllib3==1.22 urllib3==1.22
vine==1.1.4
wcwidth==0.1.7 wcwidth==0.1.7
amqp==2.2.2
billiard==3.5.0.3
blessings==1.6.1
bpython==0.17
certifi==2018.1.18
chardet==3.0.4
click==6.7 click==6.7
curtsies==0.2.11
dj-database-url==0.4.2 dj-database-url==0.4.2
Django==2.0.1 Django==2.0.1
django-rq==1.0.1
django-solo==1.1.3
greenlet==0.4.12
idna==2.6
jsonpickle==0.9.5
psycopg2==2.7.3.2 psycopg2==2.7.3.2
Pygments==2.2.0
python-decouple==3.1 python-decouple==3.1
python-digitalocean==1.13.2
python-dotenv==0.7.1 python-dotenv==0.7.1
pytz==2017.3 pytz==2017.3
redis==2.10.6
requests==2.18.4
rq==0.10.0
six==1.11.0
Unipath==1.1 Unipath==1.1
gunicorn==19.7.1 urllib3==1.22
django-solo==1.1.3 vine==1.1.4
python-digitalocean==1.13.2 wcwidth==0.1.7
\ No newline at end of file
...@@ -7,6 +7,7 @@ from solo.admin import SingletonModelAdmin ...@@ -7,6 +7,7 @@ from solo.admin import SingletonModelAdmin
from .models import Configuracao from .models import Configuracao
from .models import Cliente from .models import Cliente
from .models import ChaveSSH
admin.site.site_tile = _(settings.SITE_TITLE) admin.site.site_tile = _(settings.SITE_TITLE)
...@@ -14,3 +15,4 @@ admin.site.site_header = _(settings.SITE_HEADER) ...@@ -14,3 +15,4 @@ admin.site.site_header = _(settings.SITE_HEADER)
admin.site.register(Configuracao, SingletonModelAdmin) admin.site.register(Configuracao, SingletonModelAdmin)
admin.site.register(Cliente) admin.site.register(Cliente)
admin.site.register(ChaveSSH)
# Generated by Django 2.0.1 on 2018-01-23 11:23
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('core', '0006_remove_configuracao_droplets_ssh_keys'),
]
operations = [
migrations.AlterField(
model_name='configuracao',
name='droplets_ipv6',
field=models.BooleanField(default=False),
),
]
...@@ -2,6 +2,8 @@ from django.db import models ...@@ -2,6 +2,8 @@ from django.db import models
from django.conf import settings from django.conf import settings
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from backend.core.tasks import create_droplet_pipeline
class Cliente(models.Model): class Cliente(models.Model):
"""Model definition for Cliente.""" """Model definition for Cliente."""
...@@ -28,3 +30,10 @@ class Cliente(models.Model): ...@@ -28,3 +30,10 @@ class Cliente(models.Model):
self.domain_name, self.domain_name,
settings.BASE_DOMAIN settings.BASE_DOMAIN
) )
def save(self, *args, **kwargs):
adding = self._state.adding
super().save(*args, **kwargs)
if adding:
create_droplet_pipeline(self)
...@@ -14,8 +14,9 @@ Including another URLconf ...@@ -14,8 +14,9 @@ Including another URLconf
2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) 2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
""" """
from django.contrib import admin from django.contrib import admin
from django.urls import path from django.urls import include, path
urlpatterns = [ urlpatterns = [
path('', admin.site.urls), path('', admin.site.urls),
path('django-rq/', include('django_rq.urls')),
] ]
...@@ -2,18 +2,12 @@ ...@@ -2,18 +2,12 @@
import os import os
import sys import sys
from dotenv import load_dotenv # from dotenv import load_dotenv
from decouple import config
if __name__ == "__main__": if __name__ == "__main__":
debug = os.environ.get('DEBUG')
if not debug:
dotenv_path = os.path.join(os.path.dirname(__file__), 'config.env')
load_dotenv(dotenv_path)
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
try: try:
from django.core.management import execute_from_command_line from django.core.management import execute_from_command_line
except ImportError as exc: except ImportError as exc:
......
...@@ -6,4 +6,4 @@ from .static import * ...@@ -6,4 +6,4 @@ from .static import *
try: try:
from .local import * from .local import *
except ImportError: except ImportError:
pass pass
\ No newline at end of file
...@@ -29,8 +29,9 @@ INSTALLED_APPS = [ ...@@ -29,8 +29,9 @@ INSTALLED_APPS = [
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
# # Apps de terceiros
'solo', 'solo',
'django_rq',
# Local apps # Local apps
'backend.core', 'backend.core',
...@@ -55,6 +56,14 @@ ROOT_URLCONF = 'backend.urls' ...@@ -55,6 +56,14 @@ ROOT_URLCONF = 'backend.urls'
SITE_ID = 1 SITE_ID = 1
WSGI_APPLICATION = 'backend.wsgi.application' WSGI_APPLICATION = 'backend.wsgi.application'
RQ_QUEUES = {
'default': {
'HOST': 'localhost',
'PORT': 6379,
'DB': 0
}
}
# Database # Database
DATABASES = { DATABASES = {
'default': config( 'default': config(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment