ticket #102 attempt 1

devplacepy/services/xmlrpc/__init__.py

@@ -2,8 +2,10 @@
 
 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
@@ -25,16 +27,44 @@ 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.DEVNULL,
+            stderr=subprocess.PIPE,
         )
+        self.log(
+            f"Forking XML-RPC server spawning (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}"
@@ -65,6 +95,13 @@ 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,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+import sys
 from socketserver import ForkingMixIn
 from xmlrpc.server import SimpleXMLRPCDispatcher, SimpleXMLRPCRequestHandler, SimpleXMLRPCServer
 
@@ -116,6 +117,9 @@ 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/templates/_comment.html

@@ -1,4 +1,4 @@
-{% macro comment_cell(item, depth, parent_author=None, parent_url=None) %}
+{% macro comment_cell(item, depth, parent_author=None) %}
 <div class="comment" style="--comment-depth: {{ depth }};" data-depth="{{ depth }}">
     <div class="comment-votes" role="group" aria-label="Comment votes">
         <form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
@@ -26,7 +26,6 @@
         {% endif %}
         <div class="comment-actions">
             <button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="icon">💬</span><span class="label"> Reply</span></button>
-            <button type="button" class="comment-action-btn" data-share="{{ parent_url }}#comment-{{ item.comment['uid'] }}"><span class="icon">&#x1F517;</span><span class="label"> Share</span></button>
             {% if owns(item.comment, user) %}
             <button type="button" class="comment-action-btn" data-action="edit" data-edit-url="/comments/edit/{{ item.comment['uid'] }}"><span class="icon">✏️</span><span class="label"> Edit</span></button>
             <form method="POST" action="/comments/delete/{{ item.comment['uid'] }}" class="inline-form comment-delete-form" data-comment-uid="{{ item.comment['uid'] }}">
@@ -40,21 +39,21 @@
 </div>
 {% endmacro %}
 
-{% macro render_comment(item, depth=0, parent_url=None) %}
+{% macro render_comment(item, depth=0) %}
 {% set max_depth = 2 %}
 {% set visual_depth = depth if depth < max_depth else max_depth %}
-{% call comment_cell(item, visual_depth, parent_url=parent_url) %}
+{% call comment_cell(item, visual_depth) %}
     {% if item.children %}
     {% if depth < max_depth %}
     <div class="comment-replies">
         {% for child in item.children %}
-        {{ render_comment(child, depth + 1, parent_url) }}
+        {{ render_comment(child, depth + 1) }}
         {% endfor %}
     </div>
     {% else %}
     <div class="comment-replies comment-replies-flat">
         {% for child in item.children %}
-        {{ render_comment_flat(child, max_depth, item.author, parent_url) }}
+        {{ render_comment_flat(child, max_depth, item.author) }}
         {% endfor %}
     </div>
     {% endif %}
@@ -62,9 +61,9 @@
 {% endcall %}
 {% endmacro %}
 
-{% macro render_comment_flat(item, depth, parent_author, parent_url=None) %}
+{% macro render_comment_flat(item, depth, parent_author) %}
-{% call comment_cell(item, depth, parent_author, parent_url=parent_url) %}{% endcall %}
+{% call comment_cell(item, depth, parent_author) %}{% endcall %}
 {% for child in item.children %}
-{{ render_comment_flat(child, depth, item.author, parent_url) }}
+{{ render_comment_flat(child, depth, item.author) }}
 {% endfor %}
 {% endmacro %}

devplacepy/templates/_comment_section.html

@@ -3,10 +3,8 @@
 
     {% from "_comment.html" import render_comment with context %}
 
-    {% set parent_url = resolve_object_url(target_type, target_uid) %}
-
     {% for item in comments %}
-    {{ render_comment(item, 0, parent_url) }}
+    {{ render_comment(item, 0) }}
     {% else %}
     <p class="no-comments-msg">No comments yet. Start the discussion.</p>
     {% endfor %}

devplacepy/templating.py

@@ -9,7 +9,6 @@ from devplacepy.cache import TTLCache
 from devplacepy.config import STATIC_VERSION, TEMPLATES_DIR, TEMPLATE_AUTO_RELOAD, PRESENCE_TIMEOUT_SECONDS
 from devplacepy.constants import TOPICS, REACTION_EMOJI
 from devplacepy.database import get_int_setting, get_setting, get_table
-from devplacepy.database.content import resolve_object_url
 from devplacepy.avatar import avatar_url, avatar_seed
 from devplacepy.utils import format_date as _format_date
 from devplacepy.utils import time_ago as _time_ago
@@ -50,7 +49,6 @@ templates.env.globals["is_self"] = is_self
 templates.env.globals["guest_disabled"] = guest_disabled
 templates.env.globals["is_online"] = presence.is_online
 templates.env.globals["presence_timeout"] = PRESENCE_TIMEOUT_SECONDS
-templates.env.globals["resolve_object_url"] = resolve_object_url
 
 from devplacepy.docs_devrant import devrant_endpoints