Skip to content

Commit

Permalink
Version [5.4.3]
Browse files Browse the repository at this point in the history
  • Loading branch information
I-am-PUID-0 committed Nov 1, 2024
1 parent 3564425 commit 7e70533
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 8 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0



## Version [5.4.3] - 2024-11-01 🚀

### Changed 🔄

- Riven Frontend: Updated the name and location of the `server-config.json` file to `server.json` and to be transferred to the /riven/frontend/config directory on startup 🔄
- Re-enabled reaping of zombie processes 🔄


## Version [5.4.2] - 2024-10-29 🚀

### Fixed 🛠️
Expand Down
2 changes: 1 addition & 1 deletion main.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

def main():

version = "5.4.2"
version = "5.4.3"

ascii_art = f"""
Expand Down
2 changes: 1 addition & 1 deletion riven_/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def save_server_config(backend_url, api_key, config_dir="/config"):

os.makedirs(config_dir, exist_ok=True)

config_file_path = os.path.join(config_dir, "server-config.json")
config_file_path = os.path.join(config_dir, "server.json")

try:
with open(config_file_path, "w") as config_file:
Expand Down
17 changes: 11 additions & 6 deletions riven_/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,26 +146,31 @@ def clear_directory(directory_path, exclude_dirs=None):


def copy_server_config_to_frontend():
source_config_path = "/config/server-config.json"
destination_config_path = "/riven/frontend/server-config.json"
source_config_path = "/config/server.json"
destination_dir = "/riven/frontend/config"
destination_config_path = os.path.join(destination_dir, "server.json")

try:
if not os.path.exists(source_config_path):
logger.debug(
f"server-config.json not found at {source_config_path}, skipping copy."
f"server.json not found at {source_config_path}, skipping copy."
)
return

if not os.path.exists(destination_dir):
os.makedirs(destination_dir)
logger.debug(f"Created directory {destination_dir} for server.json")

if os.path.exists(destination_config_path):
logger.debug(
f"Overwriting existing server-config.json at {destination_config_path}"
f"Overwriting existing server.json at {destination_config_path}"
)

shutil.copy2(source_config_path, destination_config_path)
logger.debug(f"Copied server-config.json to {destination_config_path}")
logger.debug(f"Copied server.json to {destination_config_path}")

except Exception as e:
logger.error(f"Failed to copy server-config.json: {e}")
logger.error(f"Failed to copy server.json: {e}")


def riven_setup(
Expand Down
1 change: 1 addition & 0 deletions utils/processes.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ def __new__(cls, *args, **kwargs):
cls._instance.init_attributes(*args, **kwargs)
signal.signal(signal.SIGTERM, cls._instance.shutdown)
signal.signal(signal.SIGINT, cls._instance.shutdown)
signal.signal(signal.SIGCHLD, cls._instance.reap_zombies)
return cls._instance

def init_attributes(self, logger):
Expand Down

0 comments on commit 7e70533

Please sign in to comment.