Msgpack sadness FUCKING AGAIN.

Every time I update. Arrrrrgh.
Also citext continues to be broken. And both `mprpc` and `sqlalchemy-citext` seem to be unmaintained at this point. Sigh.

Author: fake-name

WebMirror/JobDispatcher.py

@@ -78,7 +78,7 @@ def acquire_timeout(lock, timeout):
 
 largv = [tmp.lower() for tmp in sys.argv]
 if "twoprocess" in largv or "oneprocess" in largv:
-	MAX_IN_FLIGHT_JOBS = 10
+	MAX_IN_FLIGHT_JOBS = 3
 else:
 	# MAX_IN_FLIGHT_JOBS = 10
 	# MAX_IN_FLIGHT_JOBS = 75

common/get_rpyc.py

@@ -11,6 +11,19 @@
 import mprpc
 import config
 
+PACK_PARAMS =  {
+							"use_bin_type":True,
+						}
+
+UNPACK_PARAMS = {
+							'raw'             : True,
+							'max_buffer_size' : 2**31-1,
+							'max_str_len'     : 2**31-1,
+							'max_bin_len'     : 2**31-1,
+							'max_array_len'   : 2**31-1,
+							'max_map_len'     : 2**31-1,
+							'max_ext_len'     : 2**31-1,
+						}
 
 
 
@@ -33,18 +46,10 @@ def __init__(self, interfacename):
 				self.rpc_client = mprpc.RPCClient(
 					host         = config.C_RPC_AGENT_HOST,
 					port         = 4315,
-					pack_params  = {
-							"use_bin_type":True,
-						},
-					unpack_params = {
-							'raw'             : True,
-							'max_buffer_size' : 2**31-1,
-							'max_str_len'     : 2**31-1,
-							'max_bin_len'     : 2**31-1,
-							'max_array_len'   : 2**31-1,
-							'max_map_len'     : 2**31-1,
-							'max_ext_len'     : 2**31-1,
-						},
+					unpack_encoding  = 'utf-8',
+					pack_encoding    = 'utf-8',
+					pack_params      = PACK_PARAMS,
+					unpack_params    = UNPACK_PARAMS,
 					)
 
 
@@ -132,13 +137,16 @@ def __init__(self):
 		for x in range(99999):
 			try:
 				self.log.info("Creating rpc_client")
-				# self.log.info("Current stack:")
-				# for line in "\n".join(traceback.format_stack()).strip().split("\n"):
-				# 	self.log.info("%s", line.rstrip())
-				# self.log.info("------------")
 
-				mp_conf = {"use_bin_type" : True}
-				self.rpc_client = mprpc.RPCClient(config.C_SYNC_RPC_SERVER, 4315, pack_params=mp_conf, timeout=90)
+				self.rpc_client = mprpc.RPCClient(
+						host             = config.C_SYNC_RPC_SERVER,
+						port             = 4315,
+						unpack_encoding  = 'utf-8',
+						pack_encoding    = 'utf-8',
+						pack_params      = PACK_PARAMS,
+						unpack_params    = UNPACK_PARAMS,
+						timeout          = 90,
+					)
 				self.log.info("Validating RPC connection")
 
 				self.check_ok()

requirements.txt

@@ -25,11 +25,14 @@ xmljson==0.2.1
 pystuck==0.8.5
 cherrypy==18.6.1
 
+# Pin to 0.6.2 since 1.0.0 is broken in mprpc
+msgpack==0.6.2
+
 psycopg2cffi==2.9.0; platform.python_implementation == 'PyPy'
 psycopg2==2.9.3; platform.python_implementation == 'CPython'
 
 SQLAlchemy<1.4.0
-sqlalchemy-citext==1.8.0; platform.python_implementation == 'PyPy'
+sqlalchemy-citext<1.8.0; platform.python_implementation == 'PyPy'
 sqlalchemy-citext==1.8.0; platform.python_implementation == 'CPython'
 
 PySocks==1.7.1