- inits centralizados, READMEs atualizados
- padronizando o nome de get_db_connection e session para get_db_session, para não confundir com session do Flask ou sessoes web
- corrigindo potenciais erros
-- has_permission nao consegue com lazy load carregar permission depois de load_user fechar a conexao, entao joinedLoad com Permission antes de fechar
-- db.rollback não existe caso db = get_db_session() apareça muito depois dentro do try, padronizando antes de try
--- comparar role por nivel (Role.SECRETARIO_GERAL) e nao por nome ("Secretario Geral")
- unificacao de get_otp_qr_code
- mudança de nowutc() para now(UTC) conforme novo padrão
This commit is contained in:
112
Makefile
112
Makefile
@@ -1,58 +1,126 @@
|
||||
.PHONY: install clean db-reset db-seed-fake db-seed-test-users admin-reset admin-rotate-otp \
|
||||
run run-gunicorn docker-db-reset docker-db-seed-fake docker-db-seed-test-users \
|
||||
docker-admin-reset docker-admin-rotate-otp docker-build docker-up docker-down docker-logs \
|
||||
docker-restart docker-db-reset-xplat docker-db-seed-fake-xplat docker-db-seed-test-users-xplat \
|
||||
docker-admin-reset-xplat docker-admin-rotate-otp-xplat docker-build-xplat docker-up-xplat \
|
||||
docker-down-xplat docker-logs-xplat cache-clear cache-status cache-keys dev-up dev-down \
|
||||
prod-build prod-up prod-logs cache-warmup cache-monitor
|
||||
|
||||
install:
|
||||
pip install -r requirements.txt
|
||||
|
||||
clean:
|
||||
rm -rf ~/.local/share/controles/database.db*
|
||||
rm -f ~/.local/share/controles/database.db*
|
||||
rm -f database.db*
|
||||
rm -f data/database.db*
|
||||
rm -f admin_qr.png
|
||||
rm -f data/admin_qr.png
|
||||
rm -f /tmp/admin_qr.png
|
||||
|
||||
init-db: clean
|
||||
python init_db.py
|
||||
db-reset: clean
|
||||
PYTHONUNBUFFERED=1 python -B scripts/manage.py db_reset
|
||||
|
||||
seed: init-db
|
||||
python seed.py
|
||||
# Apenas seed (seed_database.py)
|
||||
db-seed-fake:
|
||||
PYTHONUNBUFFERED=1 python -B scripts/manage.py db_seed_fake
|
||||
|
||||
init:
|
||||
python app.py --init
|
||||
# Apenas seed (create_test_users.py)
|
||||
db-seed-test-users:
|
||||
PYTHONUNBUFFERED=1 python -B scripts/manage.py db_seed_test_users
|
||||
|
||||
# Busca o OTP padrão
|
||||
admin-reset:
|
||||
PYTHONUNBUFFERED=1 python -B scripts/manage.py admin_reset
|
||||
|
||||
# Novo OTP
|
||||
admin-rotate-otp:
|
||||
PYTHONUNBUFFERED=1 python -B scripts/manage.py admin_rotate_otp
|
||||
|
||||
# Server padrão do python
|
||||
run:
|
||||
python app.py
|
||||
PYTHONUNBUFFERED=1 python -B app.py
|
||||
|
||||
run-with-seed: seed init run
|
||||
|
||||
reset-admin: clean
|
||||
python create_admin.py
|
||||
# server padrão de produção (recomendado)
|
||||
run-gunicorn:
|
||||
PYTHONUNBUFFERED=1 python -B -m gunicorn --bind 0.0.0.0:5000 app:app
|
||||
|
||||
# Docker commands
|
||||
docker-db-reset:
|
||||
mkdir -p data logs
|
||||
docker-compose -f docker-compose.yml exec app python -B scripts/manage.py db_reset
|
||||
|
||||
docker-db-seed-fake:
|
||||
docker-compose -f docker-compose.yml exec app python -B scripts/manage.py db_seed_fake
|
||||
|
||||
docker-db-seed-test-users:
|
||||
docker-compose -f docker-compose.yml exec app python -B scripts/manage.py db_seed_test_users
|
||||
|
||||
docker-admin-reset:
|
||||
docker-compose -f docker-compose.yml exec app python -B scripts/manage.py admin_reset
|
||||
|
||||
docker-admin-rotate-otp:
|
||||
docker-compose -f docker-compose.yml exec app python -B scripts/manage.py admin_rotate_otp
|
||||
|
||||
docker-build:
|
||||
docker-compose build
|
||||
mkdir -p data logs
|
||||
docker-compose -f docker-compose.yml build
|
||||
|
||||
docker-up:
|
||||
docker-compose up -d
|
||||
mkdir -p data logs
|
||||
docker-compose -f docker-compose.yml up -d
|
||||
|
||||
docker-down:
|
||||
docker-compose down
|
||||
docker-compose -f docker-compose.yml down
|
||||
|
||||
docker-logs:
|
||||
docker-compose logs -f
|
||||
docker-compose -f docker-compose.yml logs -f
|
||||
|
||||
docker-restart:
|
||||
docker-compose restart
|
||||
docker-compose -f docker-compose.yml restart
|
||||
|
||||
# Docker commands (fallback cross-platform)
|
||||
docker-db-reset-xplat:
|
||||
docker-compose -f docker-compose.crossplatform.yml exec app python -B scripts/manage.py db_reset
|
||||
|
||||
docker-db-seed-fake-xplat:
|
||||
docker-compose -f docker-compose.crossplatform.yml exec app python -B scripts/manage.py db_seed_fake
|
||||
|
||||
docker-db-seed-test-users-xplat:
|
||||
docker-compose -f docker-compose.crossplatform.yml exec app python -B scripts/manage.py db_seed_test_users
|
||||
|
||||
docker-admin-reset-xplat:
|
||||
docker-compose -f docker-compose.crossplatform.yml exec app python -B scripts/manage.py admin_reset
|
||||
|
||||
docker-admin-rotate-otp-xplat:
|
||||
docker-compose -f docker-compose.crossplatform.yml exec app python -B scripts/manage.py admin_rotate_otp
|
||||
|
||||
docker-build-xplat:
|
||||
mkdir -p data logs
|
||||
docker-compose -f docker-compose.crossplatform.yml build
|
||||
|
||||
docker-up-xplat:
|
||||
docker-compose -f docker-compose.crossplatform.yml up -d
|
||||
|
||||
docker-down-xplat:
|
||||
docker-compose -f docker-compose.crossplatform.yml down
|
||||
|
||||
docker-logs-xplat:
|
||||
docker-compose -f docker-compose.crossplatform.yml logs -f
|
||||
|
||||
# Redis cache commands
|
||||
cache-clear:
|
||||
docker-compose exec redis redis-cli FLUSHDB
|
||||
docker-compose -f docker-compose.yml exec redis redis-cli FLUSHDB
|
||||
|
||||
cache-status:
|
||||
docker-compose exec redis redis-cli INFO
|
||||
docker-compose -f docker-compose.yml exec redis redis-cli INFO
|
||||
|
||||
cache-keys:
|
||||
docker-compose exec redis redis-cli KEYS "*"
|
||||
docker-compose -f docker-compose.yml exec redis redis-cli KEYS "*"
|
||||
|
||||
# Development with Docker
|
||||
dev-up: docker-build docker-up
|
||||
@echo "Development environment started with Redis cache"
|
||||
@echo "Application: http://localhost:5000"
|
||||
@echo "Redis: localhost:6379"
|
||||
|
||||
dev-down: docker-down
|
||||
@echo "Development environment stopped"
|
||||
@@ -77,4 +145,4 @@ cache-warmup:
|
||||
|
||||
cache-monitor:
|
||||
@echo "Monitoring Redis cache..."
|
||||
watch -n 5 'docker-compose exec redis redis-cli INFO memory'
|
||||
watch -n 5 'docker-compose -f docker-compose.yml exec redis redis-cli INFO memory'
|
||||
|
||||
Reference in New Issue
Block a user