Merge branch 'support/3.3'

zatosource · Dec 28, 2024 · f6a1022 · f6a1022
2 parents bbf4a29 + 64cf62d
commit f6a1022
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 2,234 deletions.
diff --git a/code/requirements.txt b/code/requirements.txt
@@ -41,7 +41,7 @@ google-auth-httplib2==0.1.0
 google-auth-oauthlib==0.5.2
 greenlet==3.0.0
 hl7==0.4.1
-hl7apy==1.3.4
+hl7apy==1.3.5
 hiredis==3.1.0
 httpagentparser==1.9.0
 httplib2==0.19.0
@@ -152,12 +152,9 @@ zato-ext-simple-rbac==0.1.1
 ciso8601==2.2.0; sys_platform == 'linux'
 greenify==0.4.3; sys_platform == 'linux'
 inotify-simple==1.3.5; sys_platform == 'linux'
-memray==1.15.0; sys_platform == 'linux'
-newrelic==10.4.0; sys_platform == 'linux'
 sh==1.14.3; sys_platform == 'linux'
 portalocker==2.6.0
 psycopg2-binary==2.9.5; sys_platform == 'linux'
 pysimdjson==6.0.2; sys_platform == 'linux'
-pysolr==3.9.0; sys_platform == 'linux'
 python-ldap==3.4.0; sys_platform == 'linux'
 pywin32==305; platform_system == "Windows"
diff --git a/code/update.sh b/code/update.sh
@@ -5,7 +5,7 @@ while([ -h "${CURDIR}" ]) do CURDIR=`$RL "${CURDIR}"`; done
 N="/dev/null";pushd .>$N;cd `dirname ${CURDIR}`>$N;CURDIR=`pwd`;popd>$N
 
 # Our default branch
-Zato_Default_Branch=support/3.2
+Zato_Default_Branch=support/3.3
 
 # Always switch to a support branch first
 git checkout "${Zato_Default_Branch}" 2>/dev/null || git checkout -b "${Zato_Default_Branch}" "origin/${Zato_Default_Branch}"

diff --git a/code/zato-common/src/zato/common/util/stats.py b/code/zato-common/src/zato/common/util/stats.py
diff --git a/code/zato-common/test/zato/common/test_stats.py b/code/zato-common/test/zato/common/test_stats.py
diff --git a/code/zato-server/src/zato/server/base/parallel/__init__.py b/code/zato-server/src/zato/server/base/parallel/__init__.py
@@ -73,7 +73,6 @@
      StartConfig as SubprocessStartConfig
 from zato.server.base.parallel.subprocess_.ftp import FTPIPC
 from zato.server.base.parallel.subprocess_.ibm_mq import IBMMQIPC
-from zato.server.base.parallel.subprocess_.zato_events import ZatoEventsIPC
 from zato.server.base.parallel.subprocess_.outconn_sftp import SFTPIPC
 from zato.server.base.worker import WorkerStore
 from zato.server.config import ConfigStore
@@ -301,7 +300,6 @@ def __init__(self) -> 'None':
         self.connector_ftp    = FTPIPC(self)
         self.connector_ibm_mq = IBMMQIPC(self)
         self.connector_sftp   = SFTPIPC(self)
-        self.connector_events = ZatoEventsIPC(self)
 
         # HTTP methods allowed as a Python list
         self.http_methods_allowed = []
@@ -1374,7 +1372,6 @@ def _populate_connector_config(self, config:'SubprocessStartConfig') -> 'None':
         ipc_config_name_to_enabled = {
             IBMMQIPC.ipc_config_name: config.has_ibm_mq,
             SFTPIPC.ipc_config_name: config.has_sftp,
-            ZatoEventsIPC.ipc_config_name: config.has_stats,
         }
 
         for ipc_config_name, is_enabled in ipc_config_name_to_enabled.items():
@@ -1439,13 +1436,6 @@ def init_subprocess_connectors(self, config:'SubprocessStartConfig') -> 'None':
             'sync_interval': EventsDefault.sync_interval,
         }
 
-        if self.component_enabled['stats']:
-            _ = self.connector_events.start_zato_events_connector(ipc_tcp_start_port, extra_options_kwargs=extra_options_kwargs)
-
-            # Wait until the events connector started - this will let other parts
-            # of the server assume that it is always available.
-            _ = wait_until_port_taken(self.connector_events.ipc_tcp_port, timeout=5)
-
 # ################################################################################################################################
 
     def set_up_sso_rate_limiting(self) -> 'None':