Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion emrg/client/daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,22 @@ async def start_daemon() -> subprocess.Popen:
if is_running():
logger.info("emrgd started (pid=%d)", proc.pid)
return proc
raise RuntimeError("emrgd failed to start within timeout")
# R124: 超时后读取 emrgd.log 尾部打印真实失败原因(rant 2026-08-05T15:54:28 关联:
# config.toml 解析错误时 CLI 只显示 'failed to start within timeout',吞掉真实报错)
tail = _read_log_tail(Path.home() / ".emrg" / "emrgd.log", lines=15)
detail = f"\n emrgd.log 尾部:\n{tail}" if tail else ""
raise RuntimeError(f"emrgd failed to start within timeout{detail}")


def _read_log_tail(path: Path, lines: int = 15) -> str:
"""Return the last `lines` of a log file (empty string on any error)."""
try:
if not path.exists():
return ""
data = path.read_text(encoding="utf-8", errors="replace")
return "\n".join(data.rstrip().splitlines()[-lines:])
except OSError:
return ""


async def check_and_restart_if_stale() -> None:
Expand Down
23 changes: 23 additions & 0 deletions tests/test_daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,3 +287,26 @@ def test_close_calls_ws_close(self):
conn = self._conn()
asyncio.run(conn.close())
assert conn._ws.closed is True

class TestReadLogTail:
"""_read_log_tail — daemon start-timeout diagnostics (R124)."""

def test_tail_last_lines(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("\n".join(f"line{i}" for i in range(1, 31)), encoding="utf-8")
out = daemon_manager._read_log_tail(p, lines=5)
assert out == "line26\nline27\nline28\nline29\nline30"

def test_missing_file_returns_empty(self, tmp_path):
assert daemon_manager._read_log_tail(tmp_path / "nope.log") == ""

def test_shorter_than_lines_returns_all(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("a\nb", encoding="utf-8")
assert daemon_manager._read_log_tail(p, lines=10) == "a\nb"

def test_invalid_utf8_replaced(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_bytes(b"ok\n\xff\xfebad\nend")
out = daemon_manager._read_log_tail(p, lines=5)
assert "end" in out and "\ufffd" in out
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
emrg: daemon start timeout shows emrgd.log tail (real error, not generic message) by argszero · Pull Request #403 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion emrg/client/daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,22 @@ async def start_daemon() -> subprocess.Popen:
if is_running():
logger.info("emrgd started (pid=%d)", proc.pid)
return proc
raise RuntimeError("emrgd failed to start within timeout")
# R124: 超时后读取 emrgd.log 尾部打印真实失败原因(rant 2026-08-05T15:54:28 关联:
# config.toml 解析错误时 CLI 只显示 'failed to start within timeout',吞掉真实报错)
tail = _read_log_tail(Path.home() / ".emrg" / "emrgd.log", lines=15)
detail = f"\n emrgd.log 尾部:\n{tail}" if tail else ""
raise RuntimeError(f"emrgd failed to start within timeout{detail}")


def _read_log_tail(path: Path, lines: int = 15) -> str:
"""Return the last `lines` of a log file (empty string on any error)."""
try:
if not path.exists():
return ""
data = path.read_text(encoding="utf-8", errors="replace")
return "\n".join(data.rstrip().splitlines()[-lines:])
except OSError:
return ""


async def check_and_restart_if_stale() -> None:
Expand Down
23 changes: 23 additions & 0 deletions tests/test_daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,3 +287,26 @@ def test_close_calls_ws_close(self):
conn = self._conn()
asyncio.run(conn.close())
assert conn._ws.closed is True

class TestReadLogTail:
"""_read_log_tail — daemon start-timeout diagnostics (R124)."""

def test_tail_last_lines(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("\n".join(f"line{i}" for i in range(1, 31)), encoding="utf-8")
out = daemon_manager._read_log_tail(p, lines=5)
assert out == "line26\nline27\nline28\nline29\nline30"

def test_missing_file_returns_empty(self, tmp_path):
assert daemon_manager._read_log_tail(tmp_path / "nope.log") == ""

def test_shorter_than_lines_returns_all(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("a\nb", encoding="utf-8")
assert daemon_manager._read_log_tail(p, lines=10) == "a\nb"

def test_invalid_utf8_replaced(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_bytes(b"ok\n\xff\xfebad\nend")
out = daemon_manager._read_log_tail(p, lines=5)
assert "end" in out and "\ufffd" in out
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' emrg: daemon start timeout shows emrgd.log tail (real error, not generic message) by argszero · Pull Request #403 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion emrg/client/daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,22 @@ async def start_daemon() -> subprocess.Popen:
if is_running():
logger.info("emrgd started (pid=%d)", proc.pid)
return proc
raise RuntimeError("emrgd failed to start within timeout")
# R124: 超时后读取 emrgd.log 尾部打印真实失败原因(rant 2026-08-05T15:54:28 关联:
# config.toml 解析错误时 CLI 只显示 'failed to start within timeout',吞掉真实报错)
tail = _read_log_tail(Path.home() / ".emrg" / "emrgd.log", lines=15)
detail = f"\n emrgd.log 尾部:\n{tail}" if tail else ""
raise RuntimeError(f"emrgd failed to start within timeout{detail}")


def _read_log_tail(path: Path, lines: int = 15) -> str:
"""Return the last `lines` of a log file (empty string on any error)."""
try:
if not path.exists():
return ""
data = path.read_text(encoding="utf-8", errors="replace")
return "\n".join(data.rstrip().splitlines()[-lines:])
except OSError:
return ""


async def check_and_restart_if_stale() -> None:
Expand Down
23 changes: 23 additions & 0 deletions tests/test_daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,3 +287,26 @@ def test_close_calls_ws_close(self):
conn = self._conn()
asyncio.run(conn.close())
assert conn._ws.closed is True

class TestReadLogTail:
"""_read_log_tail — daemon start-timeout diagnostics (R124)."""

def test_tail_last_lines(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("\n".join(f"line{i}" for i in range(1, 31)), encoding="utf-8")
out = daemon_manager._read_log_tail(p, lines=5)
assert out == "line26\nline27\nline28\nline29\nline30"

def test_missing_file_returns_empty(self, tmp_path):
assert daemon_manager._read_log_tail(tmp_path / "nope.log") == ""

def test_shorter_than_lines_returns_all(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("a\nb", encoding="utf-8")
assert daemon_manager._read_log_tail(p, lines=10) == "a\nb"

def test_invalid_utf8_replaced(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_bytes(b"ok\n\xff\xfebad\nend")
out = daemon_manager._read_log_tail(p, lines=5)
assert "end" in out and "\ufffd" in out
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' emrg: daemon start timeout shows emrgd.log tail (real error, not generic message) by argszero · Pull Request #403 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion emrg/client/daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,22 @@ async def start_daemon() -> subprocess.Popen:
if is_running():
logger.info("emrgd started (pid=%d)", proc.pid)
return proc
raise RuntimeError("emrgd failed to start within timeout")
# R124: 超时后读取 emrgd.log 尾部打印真实失败原因(rant 2026-08-05T15:54:28 关联:
# config.toml 解析错误时 CLI 只显示 'failed to start within timeout',吞掉真实报错)
tail = _read_log_tail(Path.home() / ".emrg" / "emrgd.log", lines=15)
detail = f"\n emrgd.log 尾部:\n{tail}" if tail else ""
raise RuntimeError(f"emrgd failed to start within timeout{detail}")


def _read_log_tail(path: Path, lines: int = 15) -> str:
"""Return the last `lines` of a log file (empty string on any error)."""
try:
if not path.exists():
return ""
data = path.read_text(encoding="utf-8", errors="replace")
return "\n".join(data.rstrip().splitlines()[-lines:])
except OSError:
return ""


async def check_and_restart_if_stale() -> None:
Expand Down
23 changes: 23 additions & 0 deletions tests/test_daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,3 +287,26 @@ def test_close_calls_ws_close(self):
conn = self._conn()
asyncio.run(conn.close())
assert conn._ws.closed is True

class TestReadLogTail:
"""_read_log_tail — daemon start-timeout diagnostics (R124)."""

def test_tail_last_lines(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("\n".join(f"line{i}" for i in range(1, 31)), encoding="utf-8")
out = daemon_manager._read_log_tail(p, lines=5)
assert out == "line26\nline27\nline28\nline29\nline30"

def test_missing_file_returns_empty(self, tmp_path):
assert daemon_manager._read_log_tail(tmp_path / "nope.log") == ""

def test_shorter_than_lines_returns_all(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("a\nb", encoding="utf-8")
assert daemon_manager._read_log_tail(p, lines=10) == "a\nb"

def test_invalid_utf8_replaced(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_bytes(b"ok\n\xff\xfebad\nend")
out = daemon_manager._read_log_tail(p, lines=5)
assert "end" in out and "\ufffd" in out
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' emrg: daemon start timeout shows emrgd.log tail (real error, not generic message) by argszero · Pull Request #403 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion emrg/client/daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,22 @@ async def start_daemon() -> subprocess.Popen:
if is_running():
logger.info("emrgd started (pid=%d)", proc.pid)
return proc
raise RuntimeError("emrgd failed to start within timeout")
# R124: 超时后读取 emrgd.log 尾部打印真实失败原因(rant 2026-08-05T15:54:28 关联:
# config.toml 解析错误时 CLI 只显示 'failed to start within timeout',吞掉真实报错)
tail = _read_log_tail(Path.home() / ".emrg" / "emrgd.log", lines=15)
detail = f"\n emrgd.log 尾部:\n{tail}" if tail else ""
raise RuntimeError(f"emrgd failed to start within timeout{detail}")


def _read_log_tail(path: Path, lines: int = 15) -> str:
"""Return the last `lines` of a log file (empty string on any error)."""
try:
if not path.exists():
return ""
data = path.read_text(encoding="utf-8", errors="replace")
return "\n".join(data.rstrip().splitlines()[-lines:])
except OSError:
return ""


async def check_and_restart_if_stale() -> None:
Expand Down
23 changes: 23 additions & 0 deletions tests/test_daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,3 +287,26 @@ def test_close_calls_ws_close(self):
conn = self._conn()
asyncio.run(conn.close())
assert conn._ws.closed is True

class TestReadLogTail:
"""_read_log_tail — daemon start-timeout diagnostics (R124)."""

def test_tail_last_lines(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("\n".join(f"line{i}" for i in range(1, 31)), encoding="utf-8")
out = daemon_manager._read_log_tail(p, lines=5)
assert out == "line26\nline27\nline28\nline29\nline30"

def test_missing_file_returns_empty(self, tmp_path):
assert daemon_manager._read_log_tail(tmp_path / "nope.log") == ""

def test_shorter_than_lines_returns_all(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("a\nb", encoding="utf-8")
assert daemon_manager._read_log_tail(p, lines=10) == "a\nb"

def test_invalid_utf8_replaced(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_bytes(b"ok\n\xff\xfebad\nend")
out = daemon_manager._read_log_tail(p, lines=5)
assert "end" in out and "\ufffd" in out
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' emrg: daemon start timeout shows emrgd.log tail (real error, not generic message) by argszero · Pull Request #403 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion emrg/client/daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,22 @@ async def start_daemon() -> subprocess.Popen:
if is_running():
logger.info("emrgd started (pid=%d)", proc.pid)
return proc
raise RuntimeError("emrgd failed to start within timeout")
# R124: 超时后读取 emrgd.log 尾部打印真实失败原因(rant 2026-08-05T15:54:28 关联:
# config.toml 解析错误时 CLI 只显示 'failed to start within timeout',吞掉真实报错)
tail = _read_log_tail(Path.home() / ".emrg" / "emrgd.log", lines=15)
detail = f"\n emrgd.log 尾部:\n{tail}" if tail else ""
raise RuntimeError(f"emrgd failed to start within timeout{detail}")


def _read_log_tail(path: Path, lines: int = 15) -> str:
"""Return the last `lines` of a log file (empty string on any error)."""
try:
if not path.exists():
return ""
data = path.read_text(encoding="utf-8", errors="replace")
return "\n".join(data.rstrip().splitlines()[-lines:])
except OSError:
return ""


async def check_and_restart_if_stale() -> None:
Expand Down
23 changes: 23 additions & 0 deletions tests/test_daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,3 +287,26 @@ def test_close_calls_ws_close(self):
conn = self._conn()
asyncio.run(conn.close())
assert conn._ws.closed is True

class TestReadLogTail:
"""_read_log_tail — daemon start-timeout diagnostics (R124)."""

def test_tail_last_lines(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("\n".join(f"line{i}" for i in range(1, 31)), encoding="utf-8")
out = daemon_manager._read_log_tail(p, lines=5)
assert out == "line26\nline27\nline28\nline29\nline30"

def test_missing_file_returns_empty(self, tmp_path):
assert daemon_manager._read_log_tail(tmp_path / "nope.log") == ""

def test_shorter_than_lines_returns_all(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("a\nb", encoding="utf-8")
assert daemon_manager._read_log_tail(p, lines=10) == "a\nb"

def test_invalid_utf8_replaced(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_bytes(b"ok\n\xff\xfebad\nend")
out = daemon_manager._read_log_tail(p, lines=5)
assert "end" in out and "\ufffd" in out
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); emrg: daemon start timeout shows emrgd.log tail (real error, not generic message) by argszero · Pull Request #403 · argszero/emrg · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion emrg/client/daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,22 @@ async def start_daemon() -> subprocess.Popen:
if is_running():
logger.info("emrgd started (pid=%d)", proc.pid)
return proc
raise RuntimeError("emrgd failed to start within timeout")
# R124: 超时后读取 emrgd.log 尾部打印真实失败原因(rant 2026-08-05T15:54:28 关联:
# config.toml 解析错误时 CLI 只显示 'failed to start within timeout',吞掉真实报错)
tail = _read_log_tail(Path.home() / ".emrg" / "emrgd.log", lines=15)
detail = f"\n emrgd.log 尾部:\n{tail}" if tail else ""
raise RuntimeError(f"emrgd failed to start within timeout{detail}")


def _read_log_tail(path: Path, lines: int = 15) -> str:
"""Return the last `lines` of a log file (empty string on any error)."""
try:
if not path.exists():
return ""
data = path.read_text(encoding="utf-8", errors="replace")
return "\n".join(data.rstrip().splitlines()[-lines:])
except OSError:
return ""


async def check_and_restart_if_stale() -> None:
Expand Down
23 changes: 23 additions & 0 deletions tests/test_daemon_manager.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,3 +287,26 @@ def test_close_calls_ws_close(self):
conn = self._conn()
asyncio.run(conn.close())
assert conn._ws.closed is True

class TestReadLogTail:
"""_read_log_tail — daemon start-timeout diagnostics (R124)."""

def test_tail_last_lines(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("\n".join(f"line{i}" for i in range(1, 31)), encoding="utf-8")
out = daemon_manager._read_log_tail(p, lines=5)
assert out == "line26\nline27\nline28\nline29\nline30"

def test_missing_file_returns_empty(self, tmp_path):
assert daemon_manager._read_log_tail(tmp_path / "nope.log") == ""

def test_shorter_than_lines_returns_all(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_text("a\nb", encoding="utf-8")
assert daemon_manager._read_log_tail(p, lines=10) == "a\nb"

def test_invalid_utf8_replaced(self, tmp_path):
p = tmp_path / "emrgd.log"
p.write_bytes(b"ok\n\xff\xfebad\nend")
out = daemon_manager._read_log_tail(p, lines=5)
assert "end" in out and "\ufffd" in out
Loading