Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
DIARIO_MANAGER
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
DIARIO_MANAGER
Commits
a0c0e229
Commit
a0c0e229
authored
Jan 27, 2018
by
Philippe Valfok
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adicioando logs do droplet ao cliente
parent
d3ffe181
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
1 deletion
+48
-1
src/backend/core/migrations/0012_auto_20180127_1038.py
src/backend/core/migrations/0012_auto_20180127_1038.py
+23
-0
src/backend/core/models/cliente.py
src/backend/core/models/cliente.py
+21
-0
src/backend/core/tasks.py
src/backend/core/tasks.py
+4
-1
No files found.
src/backend/core/migrations/0012_auto_20180127_1038.py
0 → 100644
View file @
a0c0e229
# Generated by Django 2.0.1 on 2018-01-27 10:38
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'core'
,
'0011_remove_configuracao_chave_ssh'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'cliente'
,
name
=
'droplet_logs'
,
field
=
models
.
TextField
(
blank
=
True
,
default
=
''
),
),
migrations
.
AlterField
(
model_name
=
'cliente'
,
name
=
'domain_name'
,
field
=
models
.
CharField
(
max_length
=
50
,
unique
=
True
,
verbose_name
=
'Subdomínio'
),
),
]
src/backend/core/models/cliente.py
View file @
a0c0e229
...
...
@@ -21,6 +21,7 @@ class Cliente(models.Model):
droplet_id
=
models
.
CharField
(
_
(
'ID do droplet'
),
max_length
=
50
,
blank
=
True
,
null
=
True
)
droplet_ip
=
models
.
CharField
(
_
(
'IP do droplet'
),
max_length
=
50
,
blank
=
True
,
null
=
True
)
droplet_status
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
null
=
True
)
droplet_logs
=
models
.
TextField
(
blank
=
True
,
default
=
''
)
class
Meta
:
"""Meta definition for Cliente."""
...
...
@@ -52,6 +53,26 @@ class Cliente(models.Model):
"""
Método para alterar status rapidamente enquanto
estiver executando tarefas em background
:param text: Status em que a operação se encontra
:type text: str
:returns:
"""
self
.
droplet_status
=
text
self
.
append_log
(
text
)
self
.
save
()
def
append_log
(
self
,
log
):
"""
Método para guardar log das operações realizadas
no droplet do cliente.
É incrementado em self.droplet_logs.
:param log: Status em que a operação se encontra
:type log: str
:returns:
"""
self
.
droplet_logs
=
"{}
\n
{}"
.
format
(
self
.
droplet_logs
,
log
)
src/backend/core/tasks.py
View file @
a0c0e229
...
...
@@ -56,6 +56,7 @@ def criar_droplet(cliente):
action
.
wait
()
droplet
.
load
()
cliente
.
droplet_ip
=
droplet
.
ip_address
cliente
.
droplet_id
=
droplet
.
id
cliente
.
save
()
break
else
:
...
...
@@ -105,8 +106,10 @@ def criar_subdominio(cliente):
cliente
.
droplet_ip
],
stdout
=
subprocess
.
PIPE
)
result
=
process
.
stdout
.
decode
(
'utf-8'
)
.
strip
()
cliente
.
append_log
(
result
)
cliente
.
set_status
(
process
.
stdout
.
decode
(
'utf-8'
)
.
strip
()
.
split
(
'
\n
'
)
.
pop
()
result
.
split
(
'
\n
'
)
.
pop
()
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment