Skip to content

fix eventlet issues with detached mode #845

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

Open
PythonFZ wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix eventlet issues with detached mode #845

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
5 changes: 5 additions & 0 deletions src/zndraw/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ def daemonize(log_file: str = "zndraw.log") -> None:
# Create a new session and become session leader
os.setsid()

# Reinitialize eventlet hub after fork - kqueue file descriptors don't survive fork
import eventlet.hubs

eventlet.hubs.use_hub()

# Redirect standard file descriptors
sys.stdout.flush()
sys.stderr.flush()
Expand Down
9 changes: 5 additions & 4 deletions src/zndraw/start_celery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

import os
import platform
import subprocess
import typing as t

from eventlet.green.subprocess import subprocess_orig

if t.TYPE_CHECKING:
from zndraw.config import ZnDrawConfig


def run_celery_worker(config: "ZnDrawConfig") -> subprocess.Popen:
def run_celery_worker(config: "ZnDrawConfig") -> subprocess_orig.Popen:
"""Run a celery worker with proper configuration.

Serializes the config to environment variables using the pydantic-settings
Expand All @@ -23,7 +24,7 @@ def run_celery_worker(config: "ZnDrawConfig") -> subprocess.Popen:

Returns
-------
subprocess.Popen
subprocess_orig.Popen
Running celery worker process.
"""
from zndraw.config import LMDBStorageConfig, MongoDBStorageConfig
Expand Down Expand Up @@ -79,7 +80,7 @@ def run_celery_worker(config: "ZnDrawConfig") -> subprocess.Popen:
if config.admin_password is not None:
my_env["ZNDRAW_ADMIN_PASSWORD"] = config.admin_password.get_secret_value()

worker = subprocess.Popen(
worker = subprocess_orig.Popen(
# eventlet worker - use zndraw_cli.celery for proper monkey patching
[
"celery",
Expand Down
Loading