generated from root/miduo_client
【热更工具】添加不使用多线程上传的方式,并兼容多参数设置
parent
9acdc48604
commit
a1919b43cd
|
|
@ -51,9 +51,17 @@ def upload_file_to_txy_cos(self, path, file):
|
||||||
|
|
||||||
class Cos_Upload():
|
class Cos_Upload():
|
||||||
logging.basicConfig(level=logging.INFO, stream=sys.stdout)
|
logging.basicConfig(level=logging.INFO, stream=sys.stdout)
|
||||||
|
def __init__(self, *args):
|
||||||
def __init__(self, abDir, settingDir, changeVersion):
|
abDir = args[0]
|
||||||
|
settingDir = args[1]
|
||||||
|
changeVersion = args[2]
|
||||||
|
isThread = "1"
|
||||||
|
if args.__len__() > 3:
|
||||||
|
isThread = args[3]
|
||||||
|
|
||||||
|
self.init(abDir, settingDir, changeVersion, isThread)
|
||||||
|
|
||||||
|
def init(self, abDir, settingDir, changeVersion, isThread):
|
||||||
self.settingFile = "Setting.txt"
|
self.settingFile = "Setting.txt"
|
||||||
self.configFile = "config.txt"
|
self.configFile = "config.txt"
|
||||||
self.versionFile = "version.txt"
|
self.versionFile = "version.txt"
|
||||||
|
|
@ -65,6 +73,8 @@ class Cos_Upload():
|
||||||
self.change_file = self.setting_dir + "/__HotFixLog/" + changeVersion + ".log"
|
self.change_file = self.setting_dir + "/__HotFixLog/" + changeVersion + ".log"
|
||||||
self.loadSetting()
|
self.loadSetting()
|
||||||
|
|
||||||
|
self.IsThread = isThread
|
||||||
|
|
||||||
# cdn config
|
# cdn config
|
||||||
self.bucket = 'internal-jieling-1302131159'
|
self.bucket = 'internal-jieling-1302131159'
|
||||||
self.secret_id = "AKIDRJxLRFFzwcmiNlLzqPggdplPlrpVec2A"
|
self.secret_id = "AKIDRJxLRFFzwcmiNlLzqPggdplPlrpVec2A"
|
||||||
|
|
@ -90,11 +100,17 @@ class Cos_Upload():
|
||||||
|
|
||||||
def up(self):
|
def up(self):
|
||||||
filelist = self.get_all_file()
|
filelist = self.get_all_file()
|
||||||
pool = ProcessPoolExecutor(4)
|
if self.IsThread == "1":
|
||||||
for file in filelist:
|
pool = ProcessPoolExecutor(4)
|
||||||
pool.submit(upload_file_to_txy_cos, self, self.ab_dir + "/" + self.platform + "/", file)
|
for file in filelist:
|
||||||
pool.submit(upload_file_to_txy_cos, self, self.setting_dir +"/", self.configFile)
|
pool.submit(upload_file_to_txy_cos, self, self.ab_dir + "/" + self.platform + "/", file)
|
||||||
pool.submit(upload_file_to_txy_cos, self, self.setting_dir +"/", self.versionFile)
|
pool.submit(upload_file_to_txy_cos, self, self.setting_dir +"/", self.configFile)
|
||||||
|
pool.submit(upload_file_to_txy_cos, self, self.setting_dir +"/", self.versionFile)
|
||||||
|
else:
|
||||||
|
for file in filelist:
|
||||||
|
upload_file_to_txy_cos(self, self.ab_dir + "/" + self.platform + "/", file)
|
||||||
|
upload_file_to_txy_cos(self, self.setting_dir +"/", self.configFile)
|
||||||
|
upload_file_to_txy_cos(self, self.setting_dir +"/", self.versionFile)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -102,6 +118,9 @@ if __name__ == '__main__':
|
||||||
if sys.argv.__len__() == 4:
|
if sys.argv.__len__() == 4:
|
||||||
t = Cos_Upload(sys.argv[1], sys.argv[2], sys.argv[3])
|
t = Cos_Upload(sys.argv[1], sys.argv[2], sys.argv[3])
|
||||||
t.up()
|
t.up()
|
||||||
|
elif sys.argv.__len__() == 5:
|
||||||
|
t = Cos_Upload(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])
|
||||||
|
t.up()
|
||||||
else:
|
else:
|
||||||
print("params error!")
|
print("params error!")
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue