Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b1d4af7ca3 |
@@ -2,10 +2,8 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import socket
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
|
||||
from devplacepy.config import XMLRPC_BIND, XMLRPC_PORT
|
||||
from devplacepy.services.base import BaseService
|
||||
@@ -27,48 +25,20 @@ class XmlrpcService(BaseService):
|
||||
def __init__(self) -> None:
|
||||
super().__init__("xmlrpc", interval_seconds=XMLRPC_INTERVAL_SECONDS)
|
||||
self._process: subprocess.Popen | None = None
|
||||
self._last_stderr: str | None = None
|
||||
|
||||
def _alive(self) -> bool:
|
||||
return self._process is not None and self._process.poll() is None
|
||||
|
||||
def _spawn(self) -> None:
|
||||
self._last_stderr = None
|
||||
self._process = subprocess.Popen(
|
||||
[sys.executable, "-m", SERVER_MODULE],
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.PIPE,
|
||||
stderr=subprocess.DEVNULL,
|
||||
)
|
||||
self.log(
|
||||
f"Forking XML-RPC server spawning (pid {self._process.pid}) on "
|
||||
f"Forking XML-RPC server started (pid {self._process.pid}) on "
|
||||
f"{XMLRPC_BIND}:{XMLRPC_PORT}"
|
||||
)
|
||||
time.sleep(0.5)
|
||||
if self._process.poll() is not None:
|
||||
stderr_data = self._process.communicate()[1]
|
||||
if stderr_data:
|
||||
self._last_stderr = stderr_data.decode("utf-8", errors="replace")
|
||||
self.log(
|
||||
f"Forking XML-RPC server died after spawn (pid {self._process.pid}, "
|
||||
f"exit code {self._process.returncode})"
|
||||
)
|
||||
if self._last_stderr:
|
||||
for line in self._last_stderr.strip().split("\n"):
|
||||
self.log(f" stderr: {line}")
|
||||
return
|
||||
try:
|
||||
sock = socket.create_connection((XMLRPC_BIND, XMLRPC_PORT), timeout=1)
|
||||
sock.close()
|
||||
except (OSError, socket.timeout):
|
||||
self.log(
|
||||
f"Forking XML-RPC server not yet ready (pid {self._process.pid}) "
|
||||
f"on {XMLRPC_BIND}:{XMLRPC_PORT}"
|
||||
)
|
||||
else:
|
||||
self.log(
|
||||
f"Forking XML-RPC server started (pid {self._process.pid}) on "
|
||||
f"{XMLRPC_BIND}:{XMLRPC_PORT}"
|
||||
)
|
||||
|
||||
def _terminate(self) -> None:
|
||||
if not self._alive():
|
||||
@@ -95,13 +65,6 @@ class XmlrpcService(BaseService):
|
||||
self.log(f"XML-RPC server healthy (pid {self._process.pid})")
|
||||
return
|
||||
self.log("XML-RPC server not running, starting it")
|
||||
if self._process is not None:
|
||||
self.log(
|
||||
f"Previous process exited with code {self._process.returncode}"
|
||||
)
|
||||
if self._last_stderr:
|
||||
for line in self._last_stderr.strip().split("\n"):
|
||||
self.log(f" last stderr: {line}")
|
||||
self._spawn()
|
||||
|
||||
def collect_metrics(self) -> dict:
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import sys
|
||||
from socketserver import ForkingMixIn
|
||||
from xmlrpc.server import SimpleXMLRPCDispatcher, SimpleXMLRPCRequestHandler, SimpleXMLRPCServer
|
||||
|
||||
@@ -117,9 +116,6 @@ def main() -> None:
|
||||
server.serve_forever()
|
||||
except KeyboardInterrupt:
|
||||
logger.info("XML-RPC server interrupted")
|
||||
except Exception:
|
||||
logging.exception("XML-RPC server crashed with unhandled exception")
|
||||
sys.exit(1)
|
||||
finally:
|
||||
server.server_close()
|
||||
|
||||
|
||||
@@ -328,3 +328,44 @@
|
||||
padding: 0.75rem;
|
||||
}
|
||||
}
|
||||
|
||||
/* ---- Markdown source/preview toggle ---- */
|
||||
.gist-markdown-toggle .gist-md-tabbar {
|
||||
display: flex;
|
||||
gap: 0;
|
||||
border-bottom: 1px solid var(--border);
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.gist-markdown-toggle .gist-md-tab {
|
||||
padding: 0.5em 1em;
|
||||
cursor: pointer;
|
||||
color: var(--text-muted);
|
||||
border: 1px solid transparent;
|
||||
border-bottom: none;
|
||||
border-radius: var(--radius) var(--radius) 0 0;
|
||||
background: transparent;
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
|
||||
.gist-markdown-toggle .gist-md-tab.active {
|
||||
color: var(--text-primary);
|
||||
background: var(--bg-card);
|
||||
border-color: var(--border) var(--border) transparent;
|
||||
}
|
||||
|
||||
.gist-markdown-toggle .tab-pane {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.gist-markdown-toggle .tab-pane.active {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.gist-markdown-toggle .gist-markdown-preview {
|
||||
padding: 1em;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 0 0 var(--radius) var(--radius);
|
||||
min-height: 4em;
|
||||
background: var(--bg-card);
|
||||
}
|
||||
|
||||
@@ -35,6 +35,23 @@
|
||||
|
||||
{% if gist['language'] == 'markdown_rendered' %}
|
||||
<div class="gist-rendered-content rendered-content">{{ render_content(gist['source_code'], author_is_admin=is_admin(author)) }}</div>
|
||||
{% elif gist['language'] == 'markdown' %}
|
||||
<div class="gist-code-block gist-markdown-toggle" data-tabs>
|
||||
<nav class="gist-md-tabbar" role="tablist">
|
||||
<button type="button" class="gist-md-tab" data-tab="source" role="tab">Source</button>
|
||||
<button type="button" class="gist-md-tab" data-tab="preview" role="tab">Preview</button>
|
||||
</nav>
|
||||
<div data-tab-pane="source" class="tab-pane active" role="tabpanel">
|
||||
<div class="gist-code-header">
|
||||
<span class="gist-language-name">{{ language_name(gist['language']) }}</span>
|
||||
<button type="button" class="gist-copy-btn" data-copy="gist-code-content">Copy</button>
|
||||
</div>
|
||||
<pre><code id="gist-code-content" class="language-markdown">{{ gist['source_code'] }}</code></pre>
|
||||
</div>
|
||||
<div data-tab-pane="preview" class="tab-pane gist-markdown-preview rendered-content" role="tabpanel">
|
||||
{{ render_content(gist['source_code'], author_is_admin=is_admin(author)) }}
|
||||
</div>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="gist-code-block">
|
||||
<div class="gist-code-header">
|
||||
|
||||
Reference in New Issue
Block a user