Files
StarPunk/starpunk/database/pool.py
Phil Skentelbery 93d2398c1d feat: Implement v1.1.1 Phase 1 - Core Infrastructure
Phase 1 of v1.1.1 "Polish" release focusing on production readiness.
Implements logging, connection pooling, validation, and error handling.

Following specs in docs/design/v1.1.1/developer-qa.md and ADRs 052-055.

**Structured Logging** (Q3, ADR-054)
- RotatingFileHandler (10MB files, keep 10)
- Correlation IDs for request tracing
- All print statements replaced with logging
- Context-aware correlation IDs (init/request)
- Logs written to data/logs/starpunk.log

**Database Connection Pooling** (Q2, ADR-053)
- Connection pool with configurable size (default: 5)
- Request-scoped connections via Flask g object
- Pool statistics for monitoring
- WAL mode enabled for concurrency
- Backward compatible get_db() signature

**Configuration Validation** (Q14, ADR-052)
- Validates presence and type of all config values
- Fail-fast startup with clear error messages
- LOG_LEVEL enum validation
- Type checking for strings, integers, paths
- Non-zero exit status on errors

**Centralized Error Handling** (Q4, ADR-055)
- Moved handlers to starpunk/errors.py
- Micropub spec-compliant JSON errors
- HTML templates for browser requests
- All errors logged with correlation IDs
- MicropubError exception class

**Database Module Reorganization**
- Moved database.py to database/ package
- Separated init.py, pool.py, schema.py
- Maintains backward compatibility
- Cleaner separation of concerns

**Testing**
- 580 tests passing
- 1 pre-existing flaky test noted
- No breaking changes to public API

**Documentation**
- CHANGELOG.md updated with v1.1.1 entry
- Version bumped to 1.1.1
- Implementation report in docs/reports/

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-25 13:56:30 -07:00

197 lines
5.3 KiB
Python

"""
Database connection pool for StarPunk
Per ADR-053 and developer Q&A Q2:
- Provides connection pooling for improved performance
- Integrates with Flask's g object for request-scoped connections
- Maintains same interface as get_db() for transparency
- Pool statistics available for metrics
Note: Migrations use direct connections (not pooled) for isolation
"""
import sqlite3
from pathlib import Path
from threading import Lock
from collections import deque
from flask import g
class ConnectionPool:
"""
Simple connection pool for SQLite
SQLite doesn't benefit from traditional connection pooling like PostgreSQL,
but this provides connection reuse and request-scoped connection management.
"""
def __init__(self, db_path, pool_size=5, timeout=10.0):
"""
Initialize connection pool
Args:
db_path: Path to SQLite database file
pool_size: Maximum number of connections in pool
timeout: Timeout for getting connection (seconds)
"""
self.db_path = Path(db_path)
self.pool_size = pool_size
self.timeout = timeout
self._pool = deque(maxlen=pool_size)
self._lock = Lock()
self._stats = {
'connections_created': 0,
'connections_reused': 0,
'connections_closed': 0,
'pool_hits': 0,
'pool_misses': 0,
}
def _create_connection(self):
"""Create a new database connection"""
conn = sqlite3.connect(
self.db_path,
timeout=self.timeout,
check_same_thread=False # Allow connection reuse across threads
)
conn.row_factory = sqlite3.Row # Return rows as dictionaries
# Enable WAL mode for better concurrency
conn.execute("PRAGMA journal_mode=WAL")
self._stats['connections_created'] += 1
return conn
def get_connection(self):
"""
Get a connection from the pool
Returns:
sqlite3.Connection: Database connection
"""
with self._lock:
if self._pool:
# Reuse existing connection
conn = self._pool.pop()
self._stats['pool_hits'] += 1
self._stats['connections_reused'] += 1
return conn
else:
# Create new connection
self._stats['pool_misses'] += 1
return self._create_connection()
def return_connection(self, conn):
"""
Return a connection to the pool
Args:
conn: Database connection to return
"""
if not conn:
return
with self._lock:
if len(self._pool) < self.pool_size:
# Return to pool
self._pool.append(conn)
else:
# Pool is full, close connection
conn.close()
self._stats['connections_closed'] += 1
def close_connection(self, conn):
"""
Close a connection without returning to pool
Args:
conn: Database connection to close
"""
if conn:
conn.close()
self._stats['connections_closed'] += 1
def get_stats(self):
"""
Get pool statistics
Returns:
dict: Pool statistics for monitoring
"""
with self._lock:
return {
**self._stats,
'pool_size': len(self._pool),
'max_pool_size': self.pool_size,
}
def close_all(self):
"""Close all connections in the pool"""
with self._lock:
while self._pool:
conn = self._pool.pop()
conn.close()
self._stats['connections_closed'] += 1
# Global pool instance (initialized by app factory)
_pool = None
def init_pool(app):
"""
Initialize the connection pool
Args:
app: Flask application instance
"""
global _pool
db_path = app.config['DATABASE_PATH']
pool_size = app.config.get('DB_POOL_SIZE', 5)
timeout = app.config.get('DB_TIMEOUT', 10.0)
_pool = ConnectionPool(db_path, pool_size, timeout)
app.logger.info(f"Database connection pool initialized (size={pool_size})")
# Register teardown handler
@app.teardown_appcontext
def close_connection(error):
"""Return connection to pool when request context ends"""
conn = g.pop('db', None)
if conn:
_pool.return_connection(conn)
def get_db(app=None):
"""
Get database connection for current request
Uses Flask's g object for request-scoped connection management.
Connection is automatically returned to pool at end of request.
Args:
app: Flask application (optional, for backward compatibility with tests)
When provided, this parameter is ignored as we use the pool
Returns:
sqlite3.Connection: Database connection
"""
# Note: app parameter is kept for backward compatibility but ignored
# The pool is request-scoped via Flask's g object
if 'db' not in g:
g.db = _pool.get_connection()
return g.db
def get_pool_stats():
"""
Get connection pool statistics
Returns:
dict: Pool statistics for monitoring
"""
if _pool:
return _pool.get_stats()
return {}