ticket #94 attempt 1

devplacepy/services/xmlrpc/__init__.py

@@ -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:

devplacepy/services/xmlrpc/server.py

@@ -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()
 

devplacepy/static/js/VoteManager.js

@@ -5,18 +5,21 @@ import { OptimisticAction } from "./OptimisticAction.js";
 export class VoteManager extends OptimisticAction {
     constructor() {
         super();
-        this.initVoteButtons();
+        document.addEventListener("click", (event) => this.onClick(event));
     }
 
-    initVoteButtons() {
+    onClick(event) {
-        document.querySelectorAll('form[action^="/votes/"] button[type="submit"]').forEach((button) => {
+        const button = event.target.closest('form[action^="/votes/"] button[type="submit"]');
-            const form = button.closest("form");
+        if (!button) {
-            button.addEventListener("click", (event) => {
+            return;
-                event.preventDefault();
+        }
-                event.stopPropagation();
+        const form = button.closest("form");
-                this.cast(form, button);
+        if (!form) {
-            });
+            return;
-        });
+        }
+        event.preventDefault();
+        event.stopPropagation();
+        this.cast(form, button);
     }
 
     cast(form, button) {

devplacepy/templating.py

@@ -29,7 +29,7 @@ def is_self(user, uid) -> bool:
 def guest_disabled(user) -> Markup:
     if user:
         return Markup("")
-    return Markup(' disabled aria-disabled="true"')
+    return Markup(' disabled aria-disabled="true" title="Log in to vote"')
 
 
 def static_url(path) -> str: