Sfoglia il codice sorgente

Merge pull request #1029 from meolu/fix/fix_delete_version-2019_10_27

walle 2.1 - fix #1008 删除版本数错误, 修改Mysql配置
邹洪学 4 anni fa
parent
commit
8ba6d38719
2 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 1 1
      walle/config/settings_prod.py
  2. 1 1
      walle/service/deployer.py

+ 1 - 1
walle/config/settings_prod.py

@@ -38,7 +38,7 @@ class ProdConfig(Config):
 
     # 数据库设置 @TODO
     # SQLALCHEMY_DATABASE_URI = 'mysql://user:password@localhost:3306/walle?charset=utf8'
-    SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://{}:{}@{}:{}/{}?charset=utf8mb4'.format(
+    SQLALCHEMY_DATABASE_URI = 'mysql://{}:{}@{}:{}/{}?charset=utf8mb4'.format(
         SETTINGS["MYSQL_USER"], SETTINGS["MYSQL_PASSWORD"], SETTINGS["MYSQL_HOST"], SETTINGS["MYSQL_PORT"],
         SETTINGS["MYSQL_DATABASE"])
     # 阿里云RDS强制释放空闲连接导致经常报错 mysql server has gone way

+ 1 - 1
walle/service/deployer.py

@@ -434,7 +434,7 @@ class Deployer:
         with waller.cd(self.project_info['target_releases']):
             result = waller.run(command, wenv=self.config())
 
-        command = 'find ./ -name "{project_id}_*" -print | ls -t | tail -n +{keep_version_num} | xargs rm -rf'.format(
+        command = 'ls -t | grep ^{project_id}_ | tail -n +{keep_version_num} | xargs rm -rf'.format(
             project_id=self.project_info['id'], keep_version_num=int(self.project_info['keep_version_num']) + 1)
         with waller.cd(self.project_info['target_releases']):
             result = waller.run(command, wenv=self.config())