djaploy 1.2.7__tar.gz → 1.2.8__tar.gz

{djaploy-1.2.7 → djaploy-1.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djaploy
-Version: 1.2.7
+Version: 1.2.8
 Summary: Modular Django deployment system based on pyinfra
 Author-email: Johanna Mae Dimayuga <johanna@techco.fi>
 License: MIT License

{djaploy-1.2.7 → djaploy-1.2.8}/djaploy/apps/systemd/infra/djaploy_hooks.py

@@ -40,13 +40,13 @@ def start_services(host_data, artifact_path):
 
             # Only start if the service unit file exists — custom services
             # (e.g. streaming) may be rendered by project hooks, not djaploy core.
+            # Uses if/else so enable/restart failures still surface as errors.
             server.shell(
                 name=f"Start {slot_service} if unit exists",
                 commands=[
-                    f"test -f /etc/systemd/system/{slot_service}.service && "
-                    f"systemctl enable {slot_service} && "
-                    f"systemctl restart {slot_service} || "
-                    f"echo 'Unit {slot_service}.service not found, skipping'",
+                    f"if [ -f /etc/systemd/system/{slot_service}.service ]; then "
+                    f"systemctl enable {slot_service} && systemctl restart {slot_service}; "
+                    f"else echo 'Unit {slot_service}.service not found, skipping'; fi",
                 ],
                 _sudo=True,
             )
@@ -61,7 +61,7 @@ def start_services(host_data, artifact_path):
                 f"systemctl stop {app_name}.service 2>/dev/null || true",
                 f"systemctl disable {app_name}.service 2>/dev/null || true",
                 f"rm -f /etc/systemd/system/{app_name}.service",
-                f"systemctl daemon-reload 2>/dev/null || true",
+                "systemctl daemon-reload 2>/dev/null || true",
             ],
             _sudo=True,
         )

{djaploy-1.2.7 → djaploy-1.2.8}/djaploy/infra/djaploy_hooks.py

@@ -760,6 +760,38 @@ def rollback_release(host_data, release=None):
         active_slot = (active_slot or "").strip()
         target_slot = other_slot(active_slot) if active_slot else "blue"
 
+        # Verify the target slot has a deployment before switching
+        server.shell(
+            name=f"Verify {target_slot} slot has a deployment for rollback",
+            commands=[
+                f"python3 -c \""
+                f"import json, sys; s=json.load(open('{state_file}')); "
+                f"sys.exit(0 if s['slots'].get('{target_slot}') else 1)"
+                f"\" || (echo 'ROLLBACK ABORTED: slot {target_slot} has no deployment.' && exit 1)",
+            ],
+            _sudo=True,
+        )
+
+        # Health check: verify the target slot is running before rolling back.
+        # Retries up to 3 times with 2s delay.
+        socket_path = get_slot_socket_path(app_name, target_slot)
+        server.shell(
+            name=f"Health check: verify {target_slot} slot is healthy for rollback",
+            commands=[
+                f"for attempt in 1 2 3; do "
+                f"HTTP_CODE=$(curl -o /dev/null -w '%{{http_code}}' --max-time 5 --unix-socket {socket_path} http://localhost/ 2>/dev/null); "
+                f"if [ \"$HTTP_CODE\" != \"000\" ]; then "
+                f"echo \"Health check passed: {target_slot} slot responding (HTTP $HTTP_CODE)\"; exit 0; fi; "
+                f"echo \"Health check attempt $attempt/3: no response, retrying in 2s...\"; "
+                f"sleep 2; "
+                f"done; "
+                f"echo 'ROLLBACK ABORTED: {target_slot} slot is not responding on {socket_path}' && "
+                f"echo 'Check: systemctl status {app_name}-{target_slot}.service' && "
+                f"exit 1",
+            ],
+            _sudo=True,
+        )
+
         # Store for activate:post hooks (timers, streaming, custom nginx)
         host.data._bluegreen_activated_slot = target_slot
 
@@ -913,20 +945,22 @@ def activate_bluegreen(host_data):
             _sudo=True,
         )
 
-    # Extra gunicorn-specific check: verify the socket is responding
+    # Extra gunicorn-specific check: verify the socket accepts HTTP requests.
+    # Retries up to 3 times with 2s delay to allow freshly started gunicorn to boot.
     socket_path = get_slot_socket_path(app_name, target_slot)
     server.shell(
         name=f"Health check: verify {target_slot} gunicorn socket responds",
         commands=[
-            f"if curl -sf --max-time 5 --unix-socket {socket_path} http://localhost/ > /dev/null 2>&1; then "
-            f"echo 'Health check passed: gunicorn socket is responding'; "
-            f"elif [ -S {socket_path} ]; then "
-            f"echo 'Health check: socket exists, HTTP may be non-200 (proceeding)'; "
-            f"else "
-            f"echo 'ACTIVATION ABORTED: gunicorn socket not responding.' && "
-            f"echo 'Socket: {socket_path}' && "
-            f"exit 1; "
-            f"fi",
+            f"for attempt in 1 2 3 4 5; do "
+            f"HTTP_CODE=$(curl -o /dev/null -w '%{{http_code}}' --max-time 5 --unix-socket {socket_path} http://localhost/ 2>/dev/null); "
+            f"if [ \"$HTTP_CODE\" != \"000\" ]; then "
+            f"echo \"Health check passed: gunicorn responding (HTTP $HTTP_CODE)\"; exit 0; fi; "
+            f"echo \"Health check attempt $attempt/5: no response, retrying in 3s...\"; "
+            f"sleep 3; "
+            f"done; "
+            f"echo 'ACTIVATION ABORTED: gunicorn not responding on {socket_path}' && "
+            f"echo 'Check: systemctl status {app_name}-{target_slot}.service' && "
+            f"exit 1",
         ],
         _sudo=True,
     )
@@ -981,7 +1015,7 @@ def activate_bluegreen(host_data):
             print(f"  Venv:        {old_venv} -> {new_venv}")
 
         print(f"\n  Previous slot ({p_slot}) is still running.")
-        print(f"  To rollback: manage.py djaploy rollback --env <env>\n")
+        print("  To rollback: manage.py djaploy rollback --env <env>\n")
 
     python_op.call(
         name="Print activation summary",

{djaploy-1.2.7 → djaploy-1.2.8}/djaploy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djaploy
-Version: 1.2.7
+Version: 1.2.8
 Summary: Modular Django deployment system based on pyinfra
 Author-email: Johanna Mae Dimayuga <johanna@techco.fi>
 License: MIT License

{djaploy-1.2.7 → djaploy-1.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "djaploy"
-version = "1.2.7"
+version = "1.2.8"
 description = "Modular Django deployment system based on pyinfra"
 authors = [
     {name = "Johanna Mae Dimayuga", email = "johanna@techco.fi"}

{djaploy-1.2.7 → djaploy-1.2.8}/tests/test_bluegreen.py

@@ -527,7 +527,7 @@ class TestBluegreenHealthCheck(unittest.TestCase):
         )
 
         # Must curl the correct socket
-        self.assertIn(f"--unix-socket /run/testapp-green/testapp.sock", cmd)
+        self.assertIn("--unix-socket /run/testapp-green/testapp.sock", cmd)
         # Must check the correct service on fallback
         self.assertIn("systemctl is-active testapp-green.service", cmd)
         # Must abort with exit 1 on failure