ashatora/xmlrpcserver-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change configs

Browse Source
This commit is contained in:
ashatora
2024-06-10 07:58:57 +03:00
parent 4885bc05e4
commit cbb571920a
7 changed files with 71 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
xmlrpcserver/__main__.py
View File

@@ -20,7 +20,7 @@ from pygost import gost34112012256
import xml.etree.ElementTree as ET
from .reqs.request_xml_service import RequestXmlService
import zipfile
from .config import Config
from .config import config
from .zip import Zip
import boto3
import xmlrpcserver.db as db
@@ -50,9 +50,9 @@ channel_receive: Optional[Any] = None
def s3_connection():
return boto3.client('s3', endpoint_url=Config.s3_endpoint,
aws_access_key_id=Config.s3_key_id,
aws_secret_access_key=Config.s3_access_key)
return boto3.client('s3', endpoint_url=config.default.XMLRPCSERVER.s3.endpoint,
aws_access_key_id=config.default.XMLRPCSERVER.s3.key_id,
aws_secret_access_key=config.default.XMLRPCSERVER.s3.access_key)
def download_file(key: str, bucket: str, filename: str):
@@ -81,7 +81,7 @@ def pika_callback(ch, method, properties, body):
file['url'] = fn
files.append(file)
proxy = ServerProxy(url)
proxy.send(params, files, Config.ret_path)
proxy.send(params, files, config.default.XMLRPCSERVER.ret_path)
finally:
ch.basic_ack(delivery_tag=method.delivery_tag)
@@ -90,7 +90,8 @@ def pika_task():
global connection
global channel_receive
channel_receive = connection.channel()
channel_receive.basic_consume(queue=Config.rabbit_incoming_queue, on_message_callback=pika_callback)
channel_receive.basic_consume(queue=config.default.XMLRPCSERVER.amqp.incoming_queue,
on_message_callback=pika_callback)
channel_receive.start_consuming()
@@ -128,9 +129,11 @@ def put_object(params, files, url):
req = ET.fromstring(params['query_data'])
obj = req.find('chart')
class_id = obj.get('Class')
con = OOConnectionParams(Config.oodb_schema, Config.oodb_host, Config.oodb_port, Config.oodb_dbname,
Config.oodb_username, Config.oodb_passwd, Config.oodb_schema)
ws = OODBWorkspace.ws(Config.oodb_schema)
con = OOConnectionParams(config.default.XMLRPCSERVER.oodb.schema, config.default.XMLRPCSERVER.oodb.host,
config.default.XMLRPCSERVER.oodb.port, config.default.XMLRPCSERVER.oodb.dbname,
config.default.XMLRPCSERVER.oodb.username, config.default.XMLRPCSERVER.oodb.passwd,
config.default.XMLRPCSERVER.oodb.schema)
ws = OODBWorkspace.ws(config.default.XMLRPCSERVER.oodb.schema)
if not ws.isInit():
res = ws.init(con)
logger.warning(res)
@@ -158,9 +161,9 @@ def put_object(params, files, url):
key = uuid4().hex
fileVal.fileName = variantToString(item.relative_to(dir.name))
fileVal.key = variantToString(key)
fileVal.bucket = variantToString(Config.s3_bucket_itv)
fileVal.bucket = variantToString(config.default.XMLRPCSERVER.s3.bucket_itv)
res &= feature.addAttribute('c1000', variantFromFileValue(fileVal))
upload_file(str(item), key, Config.s3_bucket_itv)
upload_file(str(item), key, config.default.XMLRPCSERVER.s3.bucket_itv)
ws.transaction()
res = ws.save()
@@ -173,15 +176,15 @@ def accept(params, files, url):
files_s3 = []
for file in params['files']:
fn = uuid4().hex
upload_file(file['url'], fn, Config.s3_bucket)
file['url'] = {'name': fn, 'bucket': Config.s3_bucket}
upload_file(file['url'], fn, config.default.XMLRPCSERVER.s3.bucket)
file['url'] = {'name': fn, 'bucket': config.default.XMLRPCSERVER.s3.bucket}
files_s3.append(file)
data = {
'params': params,
'files': files_s3,
'url': url,
}
channel_send.basic_publish(exchange=Config.rabbit_send_exchange, body=json.dumps(data))
channel_send.basic_publish(exchange=config.default.XMLRPCSERVER.amqp.send_exchange, body=json.dumps(data))
logger.warning('Accept: ' + json.dumps(params, ensure_ascii=False))
return True
@@ -198,7 +201,7 @@ def onDelivered(params, files, callback_url):
def bnd_connected(bnd_name: str):
global channel_send
logger.warning(f'{bnd_name} connected')
channel_send.basic_publish(exchange=Config.rabbit_status_queue, body=json.dumps({
channel_send.basic_publish(exchange=config.default.XMLRPCSERVER.amqp.status_queue, body=json.dumps({
'bnd_name': bnd_name,
'status': 'connected'
}))
@@ -208,7 +211,7 @@ def bnd_connected(bnd_name: str):
def bnd_disconnected(bnd_name: str):
global channel_send
logger.warning(f'{bnd_name} disconnected')
channel_send.basic_publish(exchange=Config.rabbit_status_queue, body=json.dumps({
channel_send.basic_publish(exchange=config.default.XMLRPCSERVER.qmap.status_queue, body=json.dumps({
'bnd_name': bnd_name,
'status': 'disconnected'
}))
@@ -302,16 +305,16 @@ async def correction_replication(bnd_name: str, schema: str):
res = rxmls.get_request_document(res_id, None)
ET.SubElement(res, 'currentCommit', {'scheme': schema})
params = {
'from': f'tcp://{Config.self_bnd}',
'from': f'tcp://{config.default.XMLRPCSERVER.self_bnd}',
'to': f'tcp://{bnd_name}',
'ts_added': date.timestamp(),
'user_id': '0',
'query_type': NEW_COMMIT_REQUEST,
'query_data': ET.tostring(res, encoding='unicode', xml_declaration=True),
}
proxy = ServerProxy(Config.enserver)
proxy = ServerProxy(config.default.XMLRPCSERVER.enserver)
try:
proxy.send(params, [], Config.ret_path)
proxy.send(params, [], config.default.XMLRPCSERVER.ret_path)
except:
logger.error('Error sending')
@@ -324,7 +327,7 @@ def main():
logger.setLevel(logging.INFO)
logger.warning('Use Control-C to exit')
connection = pika.BlockingConnection(pika.URLParameters(Config.rabbit_conn))
connection = pika.BlockingConnection(pika.URLParameters(config.default.XMLRPCSERVER.amqp.conn))
channel_send = connection.channel()
xmlrpc_thread = threading.Thread(target=xmlrpc_task)