rabbitmq connection modif

This commit is contained in:
2020-05-10 18:45:21 +02:00
parent 776ab2ee13
commit a60512be30
5 changed files with 109 additions and 211 deletions

View File

@@ -1,4 +1,4 @@
#!/usr/bin/python3
#!/usr/bin/python3.8
import sys
import os
@@ -40,23 +40,31 @@ def send_mail(sev, msg, cfg):
conn.quit()
def write_queue(msg, cfg):
parameters = pika.URLParameters('amqp://' + cfg.mquser + ':' +
cfg.mqpass + '@' + cfg.mqhost +
':5672/%2F')
connection = pika.BlockingConnection(parameters)
channel = connection.channel()
channel.queue_declare(queue=cfg.queue, durable=True)
channel.basic_publish(
exchange='',
routing_key=cfg.queue,
body=msg,
properties=pika.BasicProperties(
delivery_mode=2, # make message persistent
))
logging.info("PID {:>5} >> write message {} in queue".format(
os.getpid(), msg))
connection.close()
class mq():
def __init__(self, cfg):
parameters = pika.URLParameters('amqp://' + cfg.mquser + ':' +
cfg.mqpass + '@' + cfg.mqhost +
':5672/%2F')
connection = pika.BlockingConnection(parameters)
self.channel = connection.channel()
self.channel.queue_declare(queue=cfg.csv_queue, durable=True)
def write(self, msg, cfg):
try:
self.channel.basic_publish(
exchange='',
routing_key=cfg.csv_queue,
body=msg,
properties=pika.BasicProperties(
delivery_mode=2, # make message persistent
))
logging.info("PID {:>5} >> write message {} in queue".format(
os.getpid(), msg))
except:
logging.error("PID {:>5} >> error write message {} in queue".format(
os.getpid(), msg))
def close(self):
self.connection.close()
class ASEHandler(FTPHandler):
@@ -81,22 +89,33 @@ class ASEHandler(FTPHandler):
with open(file, "r") as fileCsv:
try:
for i, line in enumerate(fileCsv.readlines(4096), 1):
if i == 1:
m1 = re.match(
r"File Creation Date: (\d*\/\d*\/\d*)\s(\d*:\d*:\d*).*",
if (m1 := re.match(
r"^(File Creation Date:\s)?(\d*\/\d*\/\d*)\s(\d*:\d*:\d*)\;*\n?$",
line,
re.I,
)
fileDate = m1.group(1)
fileTime = m1.group(2)
if i == 2:
unitType, unitName = (line.strip("\n").replace(
";", "").replace(",", "").split(" "))
if i == 6:
m6 = re.match(r"SD path: .*\/.*\/(.*)\/(.*)\..*",
line, re.I)
toolType = m6.group(1)
toolName = m6.group(2)
)):
fileDate = m1.group(2)
fileTime = m1.group(3)
elif (m2 := re.match(
r"^(\w+\d+)\s(\w+\d+)\;*\n?$",
line,
re.I,
)):
unitType = m2.group(1).upper()
unitName = m2.group(2).upper()
elif (m3 := re.match(
r"^SD path: a:\/\w+\/(\w+)(?:\.\w+)?\/*(\w*)(?:\.\w+)?\;*\n?$",
line,
re.I
)):
if m3.group(2):
toolType = m3.group(1).upper()
toolName = m3.group(2).upper()
else:
toolType = "".join(re.findall("^[a-zA-Z]+", m3.group(1))).upper()
toolName = m3.group(1).upper()
break
except:
logging.error("PID {:>5} >> Error: {}.".format(
@@ -106,18 +125,18 @@ class ASEHandler(FTPHandler):
logging.info("PID {:>5} >> {} - {} - {} - {} - {} {}.".format(
os.getpid(),
unitType.upper(),
unitName.upper(),
toolName.upper(),
toolType.upper(),
unitType,
unitName,
toolName,
toolType,
df.dateFmt(fileDate),
fileTime,
))
newPath = cfg.csvfs + self.username + "/received/" + unitName.upper(
) + "/"
newPath = cfg.csvfs + self.username + "/received/" + unitName.upper() + "/"
newFilename = (newPath + filename + "_" +
str(ts.timestamp("tms") + fileExtension))
fileRenamed = (file + "_" + str(ts.timestamp("tms")))
os.rename(file, fileRenamed)
try:
os.makedirs(newPath)
logging.info("PID {:>5} >> path {} created.".format(
@@ -126,29 +145,39 @@ class ASEHandler(FTPHandler):
logging.info("PID {:>5} >> path {} already exists.".format(
os.getpid(), newPath))
try:
os.rename(file, fileRenamed)
shutil.move(fileRenamed, newFilename)
logging.info("PID {:>5} >> {} moved into {}.".format(
os.getpid(), filenameExt, newFilename))
except OSError:
logging.error("PID {:>5} >> Error to move {} into {}.".format(
os.getpid(), filenameExt, newFilename))
# send_mail("Error",
# "OS error move " + filenameExt + " to " + newFilename, cfg)
send_mail("Error",
"OS error move " + filenameExt + " to " + newFilename, cfg)
mq_message = "{};{};{};{};{};{};{}".format(
unitType.upper(),
unitName.upper(),
toolName.upper(),
toolType.upper(),
unitType,
unitName,
toolName,
toolType,
df.dateFmt(fileDate),
fileTime,
newFilename,
)
write_queue(mq_message, cfg)
logging.info("PID {:>5} >> queue message: {}.".format(
try:
queue = mq(cfg)
queue.write(mq_message, cfg)
logging.info("PID {:>5} >> queue message: {}.".format(
os.getpid(), mq_message))
except:
logging.error("PID {:>5} >> Error to put message in queue: {}.".format(
os.getpid(), mq_message))
send_mail("Error",
"Error to put message " + mq_message + " in queue.", cfg)
finally:
queue.close()
def on_incomplete_file_received(self, file):
# remove partially uploaded files