jetstream-api 0.1.0__tar.gz → 0.1.2__tar.gz

{jetstream_api-0.1.0 → jetstream_api-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jetstream-api
-Version: 0.1.0
+Version: 0.1.2
 Summary: Python client API for iLink M.O.M. (Message Oriented Middleware)
 Author: snowjeans
 License: Boost Software License - Version 1.0 - August 17th, 2003

{jetstream_api-0.1.0 → jetstream_api-0.1.2}/ilink/__init__.py

@@ -1,6 +1,6 @@
 """iLink - Python client API for iLink M.O.M. (Message Oriented Middleware)."""
 
-__version__ = "0.1.0"
+__version__ = "0.1.2"
 
 # --- Admin / Service ---
 from .admin import ILAdminService, ILAdminQmgr, ILLogBrowser, ILQueueBrowser

{jetstream_api-0.1.0 → jetstream_api-0.1.2}/ilink/admin.py

@@ -924,6 +924,34 @@ class ILAdminService:
         except Exception as exc:
             raise ILException(exc) from exc
 
+    def removeSpoke(self, spokeKey: str) -> None:
+        """Remove a spoke connection from the service.
+
+        Args:
+            spokeKey: The spoke key identifier to remove.
+
+        Raises:
+            ILException: On communication or server-side errors.
+
+        Example::
+
+            spokes = service.getSpokeList()
+            for sp in spokes:
+                if sp.name == "SPOKE_1":
+                    service.removeSpoke(sp.key)
+                    break
+        """
+        try:
+            self.service.request(
+                ILC.MIMQ_REMOVE_SPOKE,
+                ILC.MIMQ_SUCCESSFUL_REMOVE_SPOKE,
+                spokeKey,
+            )
+        except _PASSTHROUGH_EXCEPTIONS:
+            raise
+        except Exception as exc:
+            raise ILException(exc) from exc
+
     def getSecureFileList(self) -> list[ILSecureFileProperty]:
         """Retrieve the list of secure files stored on the server.
 

{jetstream_api-0.1.0 → jetstream_api-0.1.2}/ilink/common.py

@@ -321,6 +321,7 @@ class ILC:
     MIMQ_GET_SPOKE_PROPERTY_LIST = 3319
     MIMQ_SET_SPOKE_CONNECTION = 3320
     MIMQ_ADD_SPOKE_CONNECTION = 3321
+    MIMQ_REMOVE_SPOKE = 3346
     MIMQ_SET_SECURE_FILE_PWD = 3322
     MIMQ_COMPARE_SECURE_FILE_PWD = 3323
     MIMQ_CREATE_LOG_BROWSER_REQUEST = 3324
@@ -517,6 +518,7 @@ class ILC:
     MIMQ_SUCCESSFUL_SET_SPOKE_CONNECTION = 4236
     MIMQ_NOT_SUCCESSFUL_SET_SPOKE_CONNECTION = 4237
     MIMQ_SUCCESSFUL_ADD_SPOKE_CONNECTION = 4238
+    MIMQ_SUCCESSFUL_REMOVE_SPOKE = 4268
     MIMQ_NOT_SUCCESSFUL_ADD_SPOKE_CONNECTION = 4239
     MIMQ_SUCCESSFUL_SET_SECURE_FILE_PWD = 4240
     MIMQ_NOT_SUCCESSFUL_SET_SECURE_FILE_PWD = 4241

{jetstream_api-0.1.0 → jetstream_api-0.1.2}/ilink/properties.py

@@ -1069,7 +1069,7 @@ class ILQueueRealTimeInfo(_AutoAccessor):
 class ILQueueFlow(_AutoAccessor):
     def __init__(
         self,
-        incoming_msg_count: int | None = None,
+        incoming_msg_count: int | bytes | bytearray | None = None,
         outgoing_msg_count: int | None = None,
         incoming_data_size: int | None = None,
         outgoing_data_size: int | None = None,
@@ -1082,6 +1082,10 @@ class ILQueueFlow(_AutoAccessor):
         self.outgoingDataSize = 0
         self.depth = 0
 
+        if isinstance(incoming_msg_count, (bytes, bytearray)):
+            ba = incoming_msg_count
+            incoming_msg_count = None
+
         if ba is None:
             if incoming_msg_count is not None:
                 self.incomingMsgCount = incoming_msg_count
@@ -1208,9 +1212,8 @@ class ILQmgrProperty(_AutoAccessor):
         self.acceptWaitTimeout = -1
         self.sendTimeout = 10
         self.recvWaitTimeout = 86400
-        self.acceptPoolSize = 1
-        self.eventPoolSize = 1
-        self.sessionPerThread = 10
+        self.volumeMonitorInterval = 300
+        self.volumeMonitorSizeLimit = 104857600
         self.logLevelSystem = 4
         self.logFileSizeSystem = 4194304
         self.logFileCountSystem = 5
@@ -1227,7 +1230,6 @@ class ILQmgrProperty(_AutoAccessor):
         self.aclEnabled = False
         self.aclType = 0
         self.deadLetterQueueName = ILC.MIMQ_DLQ_NAME
-        self.useAsync = False
         self.deadSessionKeepDuration = 600
         self.deadSessionMaxCount = 1000
 
@@ -1270,9 +1272,6 @@ class ILQmgrProperty(_AutoAccessor):
             offset += 20
             self.autoStart = start_mode.upper() == "AUTO"
             offset += 23
-            tmp = ba_pick_string(ba, offset, 1)
-            if tmp:
-                self.useAsync = tmp.lower() == "a"
             offset += 2
             tmp = ba_pick_string(ba, offset, 10)
             if tmp:
@@ -1301,11 +1300,12 @@ class ILQmgrProperty(_AutoAccessor):
             offset += 10
             self.recvWaitTimeout = ba_pick_int(ba, offset, 10)
             offset += 10
-            self.acceptPoolSize = ba_pick_int(ba, offset, 10)
-            offset += 10
-            self.eventPoolSize = ba_pick_int(ba, offset, 10)
+            offset += 20
+            self.volumeMonitorInterval = ba_pick_int(ba, offset, 10)
             offset += 10
-            offset += 50
+            self.volumeMonitorSizeLimit = ba_pick_long(ba, offset, 20)
+            offset += 20
+            offset += 20
             self.logLevelSystem = ba_pick_int(ba, offset, 2)
             offset += 2
             self.logFileSizeSystem = ba_pick_int(ba, offset, 15)
@@ -1336,7 +1336,6 @@ class ILQmgrProperty(_AutoAccessor):
             offset += 2
             self.aclType = ba_pick_int(ba, offset, 2)
             offset += 2
-            self.sessionPerThread = ba_pick_int(ba, offset, 10)
             offset += 10
             self.deadLetterQueueName = ba_pick_string(ba, offset, 32)
             offset += 32
@@ -1361,7 +1360,6 @@ class ILQmgrProperty(_AutoAccessor):
         ba_merge("AUTO" if self.autoStart else "MANUAL", ba, offset)
         offset += 20
         offset += 23
-        ba_merge("a" if self.useAsync else "s", ba, offset)
         offset += 2
         ba_merge(self.deadSessionKeepDuration, ba, offset)
         offset += 10
@@ -1380,11 +1378,12 @@ class ILQmgrProperty(_AutoAccessor):
         offset += 10
         ba_merge(self.recvWaitTimeout, ba, offset)
         offset += 10
-        ba_merge(self.acceptPoolSize, ba, offset)
-        offset += 10
-        ba_merge(self.eventPoolSize, ba, offset)
+        offset += 20
+        ba_merge(self.volumeMonitorInterval, ba, offset)
         offset += 10
-        offset += 50
+        ba_merge(self.volumeMonitorSizeLimit, ba, offset)
+        offset += 20
+        offset += 20
         ba_merge(self.logLevelSystem, ba, offset)
         offset += 2
         ba_merge(self.logFileSizeSystem, ba, offset)
@@ -1415,7 +1414,6 @@ class ILQmgrProperty(_AutoAccessor):
         offset += 2
         ba_merge(self.aclType, ba, offset)
         offset += 2
-        ba_merge(self.sessionPerThread, ba, offset)
         offset += 10
         ba_merge(self.deadLetterQueueName, ba, offset)
         offset += 32
@@ -1455,27 +1453,6 @@ class ILQmgrProperty(_AutoAccessor):
         _validate_log_level(value)
         self.logLevelChannel = value
 
-    def set_accept_pool_size(self, size: int) -> None:
-        if size < 1 or size > 9:
-            raise UnsupportedOperationException(
-                f"[{size}] is an unacceptable value. (acceptable value range: 1~9)"
-            )
-        self.acceptPoolSize = size
-
-    def set_event_pool_size(self, size: int) -> None:
-        if size < 1 or size > 99:
-            raise UnsupportedOperationException(
-                f"[{size}] is an unacceptable value. (acceptable value range: 1~99)"
-            )
-        self.eventPoolSize = size
-
-    def set_session_per_thread(self, count: int) -> None:
-        if count < 1:
-            raise UnsupportedOperationException(
-                f"[{count}] is an unacceptable value. (acceptable value range: 1~)"
-            )
-        self.sessionPerThread = count
-
     def set_acl_type(self, value: int) -> None:
         if value not in (ILC.MIMQ_ACL_BY_BLACKLIST, ILC.MIMQ_ACL_BY_WHITELIST):
             raise UnsupportedOperationException(
@@ -1492,18 +1469,6 @@ class ILQmgrProperty(_AutoAccessor):
         return mp
 
     def __str__(self) -> str:
-        if self.useAsync:
-            tcp_lsr = (
-                "\tTCP-LISTENER(Mode:ASYNC,AcceptPool:"
-                + str(self.acceptPoolSize)
-                + ", EventPool:"
-                + str(self.eventPoolSize)
-                + ", SessionPerThread:"
-                + str(self.sessionPerThread)
-                + ")\n"
-            )
-        else:
-            tcp_lsr = "\tTCP-LISTENER(Mode:SYNC)\n"
         return (
             "\n"
             + "\tNAME(" + self.name + ") STATUS(" + self.get_status_string() + ")\n"
@@ -1520,7 +1485,8 @@ class ILQmgrProperty(_AutoAccessor):
             + "files, " + ILC.get_log_level_string(self.logLevelChannel) + ")\n"
             + "\tCHANNEL-RETRY-INTERVAL(" + str(self.channelRetryTimeInterval)
             + "sec) SOCKET-TIMEOUT(" + str(self.recvWaitTimeout) + ")\n"
-            + tcp_lsr
+            + "\tVOLUME-MONITOR(Interval:" + str(self.volumeMonitorInterval)
+            + "sec, SizeLimit:" + str(self.volumeMonitorSizeLimit) + "bytes)\n"
             + "\tACL(" + ("ON" if self.aclEnabled else "OFF") + ") ACL-TYPE(" + self.get_acl_type_string() + ")\n"
             + "\tDEADSESSION(Max " + str(self.deadSessionMaxCount) + "ea, " + str(self.deadSessionKeepDuration) + "sec)\n"
             + "\tVERSION(" + self.version + ")\n"
@@ -1769,8 +1735,6 @@ class ILServiceProperty(_AutoAccessor):
         self.version = ""
         self.timeoutSocketConnect = 10
         self.timeoutSocketRecv = 600
-        self.poolSizeAccept = 1
-        self.poolSizeEvent = 1
         self.logLevelSystem = 4
         self.logFileSizeSystem = 4194304
         self.logFileCountSystem = 5
@@ -1808,10 +1772,7 @@ class ILServiceProperty(_AutoAccessor):
         offset += 10
         self.timeoutSocketRecv = ba_pick_int(ba, offset, 10)
         offset += 10
-        self.poolSizeAccept = ba_pick_int(ba, offset, 10)
-        offset += 10
-        self.poolSizeEvent = ba_pick_int(ba, offset, 10)
-        offset += 10
+        offset += 20
         self.logLevelSystem = ba_pick_int(ba, offset, 2)
         offset += 2
         self.logFileSizeSystem = ba_pick_int(ba, offset, 15)
@@ -1856,10 +1817,7 @@ class ILServiceProperty(_AutoAccessor):
         offset += 10
         ba_merge(self.timeoutSocketRecv, ba, offset)
         offset += 10
-        ba_merge(self.poolSizeAccept, ba, offset)
-        offset += 10
-        ba_merge(self.poolSizeEvent, ba, offset)
-        offset += 10
+        offset += 20
         ba_merge(self.logLevelSystem, ba, offset)
         offset += 2
         ba_merge(self.logFileSizeSystem, ba, offset)
@@ -1912,20 +1870,6 @@ class ILServiceProperty(_AutoAccessor):
                 f"[{log_type}] is an unacceptable value. (acceptable value list: [0 | 1])"
             )
 
-    def set_pool_size_accept(self, size: int) -> None:
-        if size < 1 or size > 9:
-            raise UnsupportedOperationException(
-                f"[{size}] is an unacceptable value. (acceptable value range: 1~9)"
-            )
-        self.poolSizeAccept = size
-
-    def set_pool_size_event(self, size: int) -> None:
-        if size < 1 or size > 99:
-            raise UnsupportedOperationException(
-                f"[{size}] is an unacceptable value. (acceptable value range: 1~99)"
-            )
-        self.poolSizeEvent = size
-
     def set_timeout_socket_connect(self, sec: int) -> None:
         if sec < -1:
             raise UnsupportedOperationException(
@@ -1958,7 +1902,6 @@ class ILServiceProperty(_AutoAccessor):
             + ") ROLLING(" + str(self.logFileSizeSystem) + "bytes, " + str(self.logFileCountSystem) + "files)\n"
             + "\tLOGGER TYPE(CLI) LEVEL(" + ILC.get_log_level_string(self.logLevelClient)
             + ") ROLLING(" + str(self.logFileSizeClient) + "bytes, " + str(self.logFileCountClient) + "files)\n"
-            + "\tTCPLSR ACCEPT(" + str(self.poolSizeAccept) + "threads) EVENT(" + str(self.poolSizeEvent) + "threads)\n"
             + "\tTCPSOCKET TIMEOUT(" + str(self.timeoutSocketRecv) + "sec)\n"
             + "\tACL(" + ("ON" if self.aclEnabled else "OFF") + ") ACL-TYPE(" + ("BLACKLIST" if self.aclType == ILC.MIMQ_ACL_BY_BLACKLIST else "WHITELIST" if self.aclType == ILC.MIMQ_ACL_BY_WHITELIST else "UNKNOWN") + ")\n"
             + "\tRELAY-TYPE(" + ("HUB" if self.is_hub() else "SPOKE") + ") NAME(" + self.name + ") HUB(" + self.hubIp + ":" + str(self.hubPort) + ")\n"

{jetstream_api-0.1.0 → jetstream_api-0.1.2}/jetstream_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jetstream-api
-Version: 0.1.0
+Version: 0.1.2
 Summary: Python client API for iLink M.O.M. (Message Oriented Middleware)
 Author: snowjeans
 License: Boost Software License - Version 1.0 - August 17th, 2003

{jetstream_api-0.1.0 → jetstream_api-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jetstream-api"
-version = "0.1.0"
+version = "0.1.2"
 description = "Python client API for iLink M.O.M. (Message Oriented Middleware)"
 authors = [{name = "snowjeans"}]
 readme = "README.md"