Skip to content
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

Jump to bottom

CURA-12091 fix infill plugin start crash #19599

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

CURA-12091 fix infill plugin start crash #19599

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5bb265a
Add environment log when starting engine/plugin
wawanbreton Aug 28, 2024
40400b2
Reset APPRUN_RUNTIME environment variable before calling plugin
wawanbreton Aug 30, 2024
79ad3e7
Reset LD_PRELOAD environment variable before calling plugin
wawanbreton Aug 30, 2024
34dcd38
Specify the plugin directory as being an AppImage module directory
wawanbreton Aug 30, 2024
19ac42f
Remove debug log
wawanbreton Aug 30, 2024
0c07609
Merge branch 'main' into CURA-12091_fix_infill_plugin_start_crash
wawanbreton Aug 30, 2024
99179de
Merge branch 'main' into CURA-12091_fix_infill_plugin_start_crash
wawanbreton Sep 3, 2024
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
13 changes: 11 additions & 2 deletions cura/BackendPlugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import socket
import os
import subprocess
import pathlib
from typing import Optional, List

from UM.Logger import Logger
Expand Down Expand Up @@ -74,7 +75,8 @@ def start(self) -> bool:
"""
if not self.usePlugin():
return False
Logger.info(f"Starting backend_plugin [{self._plugin_id}] with command: {self._validatePluginCommand()}")
validated_plugin_command = self._validatePluginCommand()
Logger.info(f"Starting backend_plugin [{self._plugin_id}] with command: {validated_plugin_command}")
plugin_log_path = os.path.join(Resources.getDataStoragePath(), f"{self.getPluginId()}.log")
if os.path.exists(plugin_log_path):
try:
Expand All @@ -93,7 +95,14 @@ def start(self) -> bool:
}
if Platform.isWindows():
popen_kwargs["creationflags"] = subprocess.CREATE_NO_WINDOW
self._process = subprocess.Popen(self._validatePluginCommand(), **popen_kwargs)

plugin_env = os.environ
if Platform.isLinux() and len(validated_plugin_command) > 0:
# Add plugin directory to AppImage "modules" directory so that it is started as if it was
# part of the AppImage and uses the sames libraries
plugin_env["APPDIR_MODULE_DIR"] = str(pathlib.Path(validated_plugin_command[0]).parent.absolute())

self._process = subprocess.Popen(validated_plugin_command, env=plugin_env, **popen_kwargs)
self._is_running = True
return True
except PermissionError:
Expand Down
Loading