Conversation
…t recovery needs The recovery step added in #162 said to read each server's dir off its cmdline and pass it as ZELLIJ_SOCKET_DIR. The cmdline path is <base>/<version-subdir>/<session>, and zellij appends the version subdir to ZELLIJ_SOCKET_DIR itself (zellij-utils consts.rs: ZELLIJ_SOCK_DIR pushes CLIENT_SERVER_CONTRACT_DIR), so the cmdline's dirname makes it look in .../contract_version_1/contract_version_1/ and see nothing. Spell out that <base> is the dir above the version subdir. Review finding from PR #162 (merged before the review landed).
Owner
Author
Review SummaryNo findings. The doc change is accurate against upstream zellij source (
Verified:
Fix commit: none pushed Verdict: approve |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #162, which merged before its review landed.
Why
The recovery step for a socket-dir split said to read each server's dir off its cmdline and pass it as
ZELLIJ_SOCKET_DIR. The cmdline path is<base>/<version-subdir>/<session>, and zellij appends the version subdir toZELLIJ_SOCKET_DIRitself (zellij-utils/src/consts.rs:ZELLIJ_SOCK_DIRpushesCLIENT_SERVER_CONTRACT_DIRafterenvs::get_socket_dir()), so passing the cmdline's dirname makeszellij attachlook in…/contract_version_1/contract_version_1/and see nothing. Read literally, the documented recovery does not attach.What
Spell out that
<base>is the dir above the version subdir (/run/user/<uid>/zellijor/tmp/zellij-<uid>), with an example cmdline path so the next reader can see where to cut.Verified
Read upstream
consts.rs,sessions.rs,envs.rsandsrc/commands.rs(server spawned as<exe> --server <socket_path>). All pre-commit hooks passed (prek), including the prose-lint suite;prose-lint.shon the file reports only pre-existing hits.via gantry