forked from retoor/devplacepy
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f674f2ed6c |
File diff suppressed because one or more lines are too long
@@ -2,8 +2,10 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import socket
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
import time
|
||||||
|
|
||||||
from devplacepy.config import XMLRPC_BIND, XMLRPC_PORT
|
from devplacepy.config import XMLRPC_BIND, XMLRPC_PORT
|
||||||
from devplacepy.services.base import BaseService
|
from devplacepy.services.base import BaseService
|
||||||
@@ -25,20 +27,48 @@ class XmlrpcService(BaseService):
|
|||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
super().__init__("xmlrpc", interval_seconds=XMLRPC_INTERVAL_SECONDS)
|
super().__init__("xmlrpc", interval_seconds=XMLRPC_INTERVAL_SECONDS)
|
||||||
self._process: subprocess.Popen | None = None
|
self._process: subprocess.Popen | None = None
|
||||||
|
self._last_stderr: str | None = None
|
||||||
|
|
||||||
def _alive(self) -> bool:
|
def _alive(self) -> bool:
|
||||||
return self._process is not None and self._process.poll() is None
|
return self._process is not None and self._process.poll() is None
|
||||||
|
|
||||||
def _spawn(self) -> None:
|
def _spawn(self) -> None:
|
||||||
|
self._last_stderr = None
|
||||||
self._process = subprocess.Popen(
|
self._process = subprocess.Popen(
|
||||||
[sys.executable, "-m", SERVER_MODULE],
|
[sys.executable, "-m", SERVER_MODULE],
|
||||||
stdout=subprocess.DEVNULL,
|
stdout=subprocess.DEVNULL,
|
||||||
stderr=subprocess.DEVNULL,
|
stderr=subprocess.PIPE,
|
||||||
)
|
)
|
||||||
self.log(
|
self.log(
|
||||||
f"Forking XML-RPC server started (pid {self._process.pid}) on "
|
f"Forking XML-RPC server spawning (pid {self._process.pid}) on "
|
||||||
f"{XMLRPC_BIND}:{XMLRPC_PORT}"
|
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:
|
def _terminate(self) -> None:
|
||||||
if not self._alive():
|
if not self._alive():
|
||||||
@@ -65,6 +95,13 @@ class XmlrpcService(BaseService):
|
|||||||
self.log(f"XML-RPC server healthy (pid {self._process.pid})")
|
self.log(f"XML-RPC server healthy (pid {self._process.pid})")
|
||||||
return
|
return
|
||||||
self.log("XML-RPC server not running, starting it")
|
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()
|
self._spawn()
|
||||||
|
|
||||||
def collect_metrics(self) -> dict:
|
def collect_metrics(self) -> dict:
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
import sys
|
||||||
from socketserver import ForkingMixIn
|
from socketserver import ForkingMixIn
|
||||||
from xmlrpc.server import SimpleXMLRPCDispatcher, SimpleXMLRPCRequestHandler, SimpleXMLRPCServer
|
from xmlrpc.server import SimpleXMLRPCDispatcher, SimpleXMLRPCRequestHandler, SimpleXMLRPCServer
|
||||||
|
|
||||||
@@ -116,6 +117,9 @@ def main() -> None:
|
|||||||
server.serve_forever()
|
server.serve_forever()
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
logger.info("XML-RPC server interrupted")
|
logger.info("XML-RPC server interrupted")
|
||||||
|
except Exception:
|
||||||
|
logging.exception("XML-RPC server crashed with unhandled exception")
|
||||||
|
sys.exit(1)
|
||||||
finally:
|
finally:
|
||||||
server.server_close()
|
server.server_close()
|
||||||
|
|
||||||
|
|||||||
@@ -172,7 +172,6 @@
|
|||||||
text-align: left;
|
text-align: left;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
touch-action: manipulation;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.poll-option[disabled] {
|
.poll-option[disabled] {
|
||||||
@@ -183,10 +182,6 @@
|
|||||||
border-color: var(--border-light);
|
border-color: var(--border-light);
|
||||||
}
|
}
|
||||||
|
|
||||||
.poll-option:not([disabled]):active {
|
|
||||||
background-color: var(--bg-card-hover);
|
|
||||||
}
|
|
||||||
|
|
||||||
.poll-option.chosen {
|
.poll-option.chosen {
|
||||||
border-color: var(--accent);
|
border-color: var(--accent);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,7 @@ import { OptimisticAction } from "./OptimisticAction.js";
|
|||||||
export class PollManager extends OptimisticAction {
|
export class PollManager extends OptimisticAction {
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
this.container = null;
|
document.addEventListener("click", (event) => this.onClick(event));
|
||||||
document.addEventListener("pointerdown", (event) => this.onClick(event));
|
|
||||||
document.addEventListener("submit", (event) => this.onSubmit(event), true);
|
document.addEventListener("submit", (event) => this.onSubmit(event), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,8 +42,7 @@ export class PollManager extends OptimisticAction {
|
|||||||
}
|
}
|
||||||
const pollUid = poll.dataset.pollUid;
|
const pollUid = poll.dataset.pollUid;
|
||||||
const optionUid = option.dataset.optionUid;
|
const optionUid = option.dataset.optionUid;
|
||||||
this.container = poll;
|
await this.submit(`/polls/${pollUid}/vote`, { option_uid: optionUid }, null, (result) => this.render(poll, result));
|
||||||
await this.submit(`/polls/${pollUid}/vote`, { option_uid: optionUid }, this.container, (result) => this.render(poll, result));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
render(poll, result) {
|
render(poll, result) {
|
||||||
|
|||||||
Reference in New Issue
Block a user