phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2026-03-26 06:00:07 +01:00
Code Issues Activity

🐛 Use DispatchQueue to manage concurrent access to PATH

Browse Source
This commit is contained in:
Nico Verbruggen
2025-12-11 10:51:06 +01:00
parent 6636d89a96
commit a29b1df480
3 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PHP Monitor.xcodeproj/project.pbxproj
View File

@@ -3994,7 +3994,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1815;
CURRENT_PROJECT_VERSION = 1817;
DEAD_CODE_STRIPPING = YES;
DEBUG = YES;
ENABLE_APP_SANDBOX = NO;
@@ -4038,7 +4038,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1815;
CURRENT_PROJECT_VERSION = 1817;
DEAD_CODE_STRIPPING = YES;
DEBUG = NO;
ENABLE_APP_SANDBOX = NO;
@@ -4220,7 +4220,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1815;
CURRENT_PROJECT_VERSION = 1817;
DEAD_CODE_STRIPPING = YES;
DEBUG = YES;
ENABLE_APP_SANDBOX = NO;
@@ -4413,7 +4413,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1815;
CURRENT_PROJECT_VERSION = 1817;
DEAD_CODE_STRIPPING = YES;
DEBUG = NO;
ENABLE_APP_SANDBOX = NO;

28
phpmon/Common/Shell/RealShell.swift
View File

@@ -13,7 +13,7 @@ class RealShell: ShellProtocol {
init(container: Container) {
self.container = container
self.PATH = RealShell.getPath()
self._PATH = RealShell.getPath()
}
/**
@@ -22,11 +22,24 @@ class RealShell: ShellProtocol {
*/
private(set) var launchPath: String = "/bin/sh"
/**
Thread-safe access to PATH is ensured via this queue.
*/
private let pathQueue = DispatchQueue(label: "com.nicoverbruggen.phpmon.shell_path")
/**
For some commands, we need to know what's in the user's PATH.
The entire PATH is retrieved here, so we can set the PATH in our own terminal as necessary.
*/
private(set) var PATH: String
private var _PATH: String
/**
Accessor for the PATH (thread-safe access with DispatchQueue).
*/
internal var PATH: String {
get { pathQueue.sync { _PATH } }
set { pathQueue.sync { _PATH = newValue } }
}
/**
Exports are additional environment variables set by the user via the custom configuration.
@@ -45,15 +58,10 @@ class RealShell: ShellProtocol {
let pipe = Pipe()
task.standardOutput = pipe
task.launch()
task.waitUntilExit()
let path = String(
data: pipe.fileHandleForReading.readDataToEndOfFile(),
encoding: String.Encoding.utf8
) ?? ""
try? pipe.fileHandleForReading.close()
return path
let path = getStringOutput(from: pipe)
return path.trimmingCharacters(in: .whitespacesAndNewlines)
}
/**