|
@@ -11,9 +11,10 @@ import time, datetime, os, traceback, pytz
|
|
from pytz import timezone
|
|
from pytz import timezone
|
|
import zipfile, tempfile, shutil, paramiko
|
|
import zipfile, tempfile, shutil, paramiko
|
|
from common.database_dml import get_data_from_mongo
|
|
from common.database_dml import get_data_from_mongo
|
|
-from common.logs import Log
|
|
|
|
-logger = Log('data-processing').logger
|
|
|
|
-
|
|
|
|
|
|
+import logging
|
|
|
|
+# from common.logs import Log
|
|
|
|
+# logger = Log('data-processing').logger
|
|
|
|
+logger = logging.getLogger()
|
|
app = Flask('pre_data_ftp——service')
|
|
app = Flask('pre_data_ftp——service')
|
|
|
|
|
|
ftp_params = {
|
|
ftp_params = {
|
|
@@ -120,8 +121,7 @@ def upload_sftp(zip_path, zip_file, args):
|
|
sftp, ssh = sftp_connect(ftp_host, ftp_port, ftp_user, ftp_pass)
|
|
sftp, ssh = sftp_connect(ftp_host, ftp_port, ftp_user, ftp_pass)
|
|
if sftp and ssh:
|
|
if sftp and ssh:
|
|
# 上传文件
|
|
# 上传文件
|
|
- with open(zip_path, 'rb') as f:
|
|
|
|
- sftp_upload(sftp, f, 'STOR /' + ftp_params[args['user']]['modeler'] + '/'+zip_file)
|
|
|
|
|
|
+ sftp_upload(sftp, zip_path, 'STOR /' + ftp_params[args['user']]['modeler'] + '/'+zip_file)
|
|
# 关闭连接
|
|
# 关闭连接
|
|
sftp_close(sftp, ssh)
|
|
sftp_close(sftp, ssh)
|
|
|
|
|