rename csv before move
This commit is contained in:
32
CsvLoader.py
32
CsvLoader.py
@@ -8,38 +8,14 @@ import pika
|
|||||||
import re
|
import re
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from smtplib import SMTP_SSL as SMTP, SMTPException, SMTPAuthenticationError
|
||||||
|
from email.mime.text import MIMEText
|
||||||
|
|
||||||
from configparser import ConfigParser
|
from configparser import ConfigParser
|
||||||
|
|
||||||
from asebat.timefmt import timestamp_fmt as ts
|
from asebat.timefmt import timestamp_fmt as ts
|
||||||
from asebat.timefmt import date_refmt as df
|
from asebat.timefmt import date_refmt as df
|
||||||
|
from asebat.config import set_config as setting
|
||||||
|
|
||||||
class config():
|
|
||||||
def __init__(self):
|
|
||||||
c = ConfigParser()
|
|
||||||
c.read([
|
|
||||||
"/etc/ase/ftpcsvreceiver.ini",
|
|
||||||
"./ftpcsvreceiver.ini"
|
|
||||||
])
|
|
||||||
|
|
||||||
self.firstport = c.getint("ftpserver", "firstport")
|
|
||||||
self.logfilename = c.get("ftpserver", "logfilename")
|
|
||||||
self.proxyaddr = c.get("ftpserver", "proxyaddr")
|
|
||||||
|
|
||||||
self.smtphost = c.get("mailserver", "hostname")
|
|
||||||
self.smtpport = c.getint("mailserver", "port")
|
|
||||||
self.sender = c.get("mailserver", "sender")
|
|
||||||
self.password = c.get("mailserver", "password")
|
|
||||||
self.receivers = c.get("mailserver", "receivers")
|
|
||||||
self.message = c.get("mailserver", "message")
|
|
||||||
self.subject = c.get("mailserver", "subject")
|
|
||||||
self.debuglevel = c.getint("mailserver", "debug")
|
|
||||||
|
|
||||||
self.mqhost = c.get("mqserver", "hostname")
|
|
||||||
self.mquser = c.get("mqserver", "user")
|
|
||||||
self.mqpass = c.get("mqserver", "password")
|
|
||||||
|
|
||||||
self.csvfs = c.get("csvfs", "path")
|
|
||||||
|
|
||||||
def send_mail(sev, msg, cfg):
|
def send_mail(sev, msg, cfg):
|
||||||
msg = MIMEText(cfg.message + "\n" + msg)
|
msg = MIMEText(cfg.message + "\n" + msg)
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ from email.mime.text import MIMEText
|
|||||||
|
|
||||||
from asebat.timefmt import timestamp_fmt as ts
|
from asebat.timefmt import timestamp_fmt as ts
|
||||||
from asebat.timefmt import date_refmt as df
|
from asebat.timefmt import date_refmt as df
|
||||||
from asebat.config import set_config as config
|
from asebat.config import set_config as setting
|
||||||
|
|
||||||
from pyftpdlib.handlers import FTPHandler
|
from pyftpdlib.handlers import FTPHandler
|
||||||
from pyftpdlib.servers import FTPServer
|
from pyftpdlib.servers import FTPServer
|
||||||
@@ -117,6 +117,7 @@ class ASEHandler(FTPHandler):
|
|||||||
) + "/"
|
) + "/"
|
||||||
newFilename = (newPath + filename + "_" +
|
newFilename = (newPath + filename + "_" +
|
||||||
str(ts.timestamp("tms") + fileExtension))
|
str(ts.timestamp("tms") + fileExtension))
|
||||||
|
fileRenamed = (file + "_" + str(ts.timestamp("tms")))
|
||||||
try:
|
try:
|
||||||
os.makedirs(newPath)
|
os.makedirs(newPath)
|
||||||
logging.info("PID {:>5} >> path {} created.".format(
|
logging.info("PID {:>5} >> path {} created.".format(
|
||||||
@@ -125,7 +126,8 @@ class ASEHandler(FTPHandler):
|
|||||||
logging.info("PID {:>5} >> path {} already exists.".format(
|
logging.info("PID {:>5} >> path {} already exists.".format(
|
||||||
os.getpid(), newPath))
|
os.getpid(), newPath))
|
||||||
try:
|
try:
|
||||||
shutil.move(file, newFilename)
|
os.rename(file, fileRenamed)
|
||||||
|
shutil.move(fileRenamed, newFilename)
|
||||||
logging.info("PID {:>5} >> {} moved into {}.".format(
|
logging.info("PID {:>5} >> {} moved into {}.".format(
|
||||||
os.getpid(), filenameExt, newFilename))
|
os.getpid(), filenameExt, newFilename))
|
||||||
except OSError:
|
except OSError:
|
||||||
@@ -154,7 +156,7 @@ class ASEHandler(FTPHandler):
|
|||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
cfg = config.config()
|
cfg = setting.config()
|
||||||
try:
|
try:
|
||||||
authorizer = UnixAuthorizer(rejected_users=["root"],
|
authorizer = UnixAuthorizer(rejected_users=["root"],
|
||||||
require_valid_shell=True)
|
require_valid_shell=True)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
"""
|
"""
|
||||||
from configparser import ConfigParser
|
from configparser import ConfigParser
|
||||||
|
|
||||||
|
|
||||||
class config():
|
class config():
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
c = ConfigParser()
|
c = ConfigParser()
|
||||||
|
|||||||
Reference in New Issue
Block a user