Skip to content

Commit

Permalink
No longer make the server work as a child reaper (PR #7845)
Browse files Browse the repository at this point in the history
# Description

revert #7786
  • Loading branch information
wouterdb authored and inmantaci committed Jul 10, 2024
1 parent 0363cc1 commit 41a218f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
2 changes: 0 additions & 2 deletions changelogs/13.0.0/agent_executor_6_5.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
description: Make the server work as a child reaper
change-type: patch
destination-branches: [master]
sections:
minor-improvement: The server now also cleans up zombie processes, which is convenient when running in a container
3 changes: 3 additions & 0 deletions changelogs/unreleased/agent_executor_6_5_revert.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
description: No longer make the server work as a child reaper
change-type: patch
destination-branches: [master]
8 changes: 0 additions & 8 deletions src/inmanta/server/bootloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import importlib
import logging
import pkgutil
from asyncio import FastChildWatcher
from collections.abc import Generator
from pkgutil import ModuleInfo
from types import ModuleType
Expand Down Expand Up @@ -101,13 +100,6 @@ def __init__(self, configure_logging: bool = False) -> None:
inmanta_logger_config.apply_options(inmanta_logging.Options())

async def start(self) -> None:

# Use the fast child watcher
# It also servers as a reaper when the server is pid 1 in a container
childwatcher = FastChildWatcher()
childwatcher.attach_loop(asyncio.get_running_loop())
asyncio.set_child_watcher(childwatcher)

db_wait_time: int = config.db_wait_time.get()
if db_wait_time != 0:
# Wait for the database to be up before starting the server
Expand Down

0 comments on commit 41a218f

Please sign in to comment.