Skip to content

added debug flag #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffreyaven merged 1 commit into from
Jan 14, 2024
Merged

added debug flag #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ ENV POSTGRES_USER=stackql
ENV POSTGRES_PASSWORD=stackql
ENV POSTGRES_DB=stackql

# Environment variable to toggle DEBUG mode
ENV DEBUG=false

# Environment variable to toggle SECURE_MODE
ENV SECURE_MODE=false

Expand Down
15 changes: 12 additions & 3 deletions startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,34 @@ check_certs_and_keys() {

# Function to start StackQL with or without mTLS
start_stackql() {
# Initialize debug arguments
local debug_args=""

# Check if DEBUG mode is enabled
if [ "$DEBUG" = "true" ]; then
debug_args="--loglevel=debug --pgsrv.loglevel=DEBUG"
fi

if [ "$SECURE_MODE" = "true" ]; then
echo "Running with mTLS..."
set_cert_dir
check_certs_and_keys
CLIENT_CA_ENCODED=$(base64 -w 0 "$CERT_DIR/client_cert.pem")
# Start the server with TLS configuration
# Start the server with TLS configuration and potentially debug arguments
/srv/stackql/stackql srv --approot=/srv/stackql/.stackql \
--pgsrv.port=$PGSRV_PORT \
--sqlBackend="{\"dbEngine\": \"postgres_tcp\", \"sqlDialect\": \"postgres\", \"dsn\": \"postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}\"}" \
--pgsrv.tls="{ \
\"keyFilePath\": \"$CERT_DIR/server_key.pem\", \
\"certFilePath\": \"$CERT_DIR/server_cert.pem\", \
\"clientCAs\": [\"$CLIENT_CA_ENCODED\"] \
}"
}" $debug_args
else
echo "Running without mTLS..."
# Start the server without TLS configuration but with potentially debug arguments
/srv/stackql/stackql srv --approot=/srv/stackql/.stackql \
--pgsrv.port=$PGSRV_PORT \
--sqlBackend="{\"dbEngine\": \"postgres_tcp\", \"sqlDialect\": \"postgres\", \"dsn\": \"postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}\"}"
--sqlBackend="{\"dbEngine\": \"postgres_tcp\", \"sqlDialect\": \"postgres\", \"dsn\": \"postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}\"}" $debug_args
fi
}

Expand Down