fixcore-engine 0.1.4__tar.gz → 0.1.6__tar.gz

{fixcore_engine-0.1.4/fixcore_engine.egg-info → fixcore_engine-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixcore-engine
-Version: 0.1.4
+Version: 0.1.6
 Summary: Pure Python FIX protocol engine
 Author-email: Aidan Chisholm <aidan.chisholm@gmail.com>
 License: MIT License

{fixcore_engine-0.1.4 → fixcore_engine-0.1.6}/fixcore/session/session.py

@@ -3,10 +3,13 @@
 from __future__ import annotations
 
 import asyncio
+import logging
 import time
 from datetime import datetime, timezone
 from typing import Awaitable, Callable
 
+logger = logging.getLogger(__name__)
+
 from fixcore.application import Application
 from fixcore.log.base import Log
 from fixcore.message.message import Message
@@ -111,17 +114,22 @@ class Session:
 
     async def on_connect(self, send_fn: SendFn) -> None:
         """Called by transport when connection is established."""
+        logger.debug("[%s] on_connect: setting send_fn", self._id)
         self._send_fn = send_fn
         self._last_recv_time = time.monotonic()
 
         if self._reset_on_logon:
+            logger.debug("[%s] on_connect: resetting store", self._id)
             self._store.reset()
 
         self._state = SessionState.LOGON_TIMEOUT
+        logger.debug("[%s] on_connect: starting timer loop", self._id)
         self._heartbeat_task = asyncio.create_task(self._timer_loop())
 
         if self._is_initiator:
+            logger.debug("[%s] on_connect: sending Logon", self._id)
             await self._send_logon()
+            logger.debug("[%s] on_connect: Logon sent", self._id)
 
     async def on_disconnect(self) -> None:
         """Called by transport when connection is lost."""
@@ -304,13 +312,16 @@ class Session:
     # ------------------------------------------------------------------
 
     async def _send_logon(self) -> None:
+        logger.debug("[%s] _send_logon: building Logon message", self._id)
         msg = Message()
         msg.header.set(TAG_MSG_TYPE, MSG_LOGON)
         msg.set_field(TAG_ENCRYPT_METHOD, "0")
         msg.set_field(TAG_HEART_BT_INT, str(self._heartbt_int))
         self._app.to_admin(msg, self._id)
+        logger.debug("[%s] _send_logon: calling _send_message", self._id)
         await self._send_message(msg, is_admin=True)
         self._logon_sent_at = time.monotonic()
+        logger.debug("[%s] _send_logon: complete", self._id)
 
     async def _send_logout(self, text: str = "") -> None:
         msg = Message()
@@ -435,6 +446,7 @@ class Session:
         msg.header.set(TAG_SENDING_TIME, _utc_timestamp())
 
         raw = msg.encode()
+        logger.debug("[%s] _send_message: seq=%s len=%d", self._id, seq_num, len(raw))
         self._store.set(seq_num, raw)
         self._store.incr_next_sender_msg_seq_num()
         self._last_send_time = time.monotonic()
@@ -442,7 +454,11 @@ class Session:
         self._log.on_outgoing(raw.replace(b"\x01", b"|").decode("latin-1"))
 
         if self._send_fn is not None:
+            logger.debug("[%s] _send_message: calling send_fn", self._id)
             await self._send_fn(raw)
+            logger.debug("[%s] _send_message: send_fn returned", self._id)
+        else:
+            logger.warning("[%s] _send_message: send_fn is None — message not sent", self._id)
 
     # ------------------------------------------------------------------
     # Sequence number validation

{fixcore_engine-0.1.4 → fixcore_engine-0.1.6}/fixcore/transport/initiator.py

@@ -3,8 +3,11 @@
 from __future__ import annotations
 
 import asyncio
+import logging
 
 from fixcore.application import Application
+
+logger = logging.getLogger(__name__)
 from fixcore.log.base import LogFactory
 from fixcore.session.session import Session
 from fixcore.session.session_id import SessionID
@@ -61,12 +64,14 @@ class SocketInitiator:
         """Launch a connect-loop task for each configured initiator session."""
         self._stop_event.clear()
         self._no_reconnect.clear()
+        logger.info("SocketInitiator starting %d session(s)", len(self._sessions))
         for sid, session in self._sessions.items():
             task = asyncio.create_task(
                 self._connect_loop(sid, session),
                 name=f"initiator-{sid}",
             )
             self._tasks.append(task)
+            logger.debug("Connect-loop task created for %s", sid)
 
     async def stop(self) -> None:
         """Signal all connect loops to exit and wait for them to finish."""
@@ -108,14 +113,17 @@ class SocketInitiator:
         port = int(self._settings.get(sid, "SocketConnectPort"))
         reconnect = self._settings.get_int(sid, "ReconnectInterval", 10)
 
+        logger.info("[%s] Connect loop started — target %s:%s", sid, host, port)
         while not self._stop_event.is_set():
+            logger.debug("[%s] Attempting connection to %s:%s", sid, host, port)
             try:
                 reader, writer = await asyncio.open_connection(host, port)
-            except OSError:
-                # Connection refused or network error — wait and retry
+            except OSError as exc:
+                logger.warning("[%s] Connection failed: %s — retrying in %ss", sid, exc, reconnect)
                 await self._interruptible_sleep(reconnect)
                 continue
 
+            logger.info("[%s] TCP connected to %s:%s", sid, host, port)
             framer = MessageFramer()
 
             async def send_fn(data: bytes, _w: asyncio.StreamWriter = writer) -> None:
@@ -123,21 +131,26 @@ class SocketInitiator:
                 await _w.drain()
 
             await session.on_connect(send_fn)
+            logger.debug("[%s] on_connect complete — Logon sent", sid)
 
             try:
                 while not self._stop_event.is_set():
                     try:
                         data = await reader.read(4096)
                     except (ConnectionResetError, asyncio.IncompleteReadError,
-                            asyncio.CancelledError):
+                            asyncio.CancelledError) as exc:
+                        logger.info("[%s] Read interrupted: %s", sid, type(exc).__name__)
                         break
                     if not data:
+                        logger.info("[%s] Connection closed by peer", sid)
                         break
 
+                    logger.debug("[%s] Received %d bytes", sid, len(data))
                     for raw_msg in framer.feed(data):
                         await session.on_data(raw_msg)
 
             finally:
+                logger.info("[%s] Disconnecting", sid)
                 await session.on_disconnect()
                 try:
                     writer.close()
@@ -147,6 +160,7 @@ class SocketInitiator:
                 framer.reset()
 
             if not self._stop_event.is_set() and not self._no_reconnect.is_set():
+                logger.info("[%s] Waiting %ss before reconnect", sid, reconnect)
                 await self._interruptible_sleep(reconnect)
 
     async def _interruptible_sleep(self, seconds: float) -> None:

{fixcore_engine-0.1.4 → fixcore_engine-0.1.6/fixcore_engine.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixcore-engine
-Version: 0.1.4
+Version: 0.1.6
 Summary: Pure Python FIX protocol engine
 Author-email: Aidan Chisholm <aidan.chisholm@gmail.com>
 License: MIT License

{fixcore_engine-0.1.4 → fixcore_engine-0.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fixcore-engine"
-version = "0.1.4"
+version = "0.1.6"
 description = "Pure Python FIX protocol engine"
 readme = "README.md"
 license = { file = "LICENSE" }