v1.4.0

README.md

@@ -1,3 +1,4 @@
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dba-archery/community)
 [![Build Status](https://travis-ci.org/hhyo/archery.svg?branch=master)](https://travis-ci.org/hhyo/archery)
 [![codecov](https://codecov.io/gh/hhyo/archery/branch/master/graph/badge.svg)](https://codecov.io/gh/hhyo/archery)
 [![version](https://img.shields.io/badge/python-3.6.5-blue.svg)](https://www.python.org/downloads/release/python-365/)
@@ -8,8 +9,11 @@
 
 介绍
 ============
-项目基于[archer](https://github.com/jly8866/archer)，优化了工作流、权限、项目、配置管理等一系列模块，不定期更新，请通过[Issues](https://github.com/hhyo/archery/issues)沟通反馈
+archery是[archer](https://github.com/jly8866/archer)的一个分支项目，主要对工作流、权限、项目、配置管理等模块进行了优化改造，新增了数据库审核、binlog解析、表结构同步、实例用户管理等实用功能。同时对多类型数据库(MsSQL/PostgreSQL/Redis)的支持也在不断完善中。不定期更新，请通过[Issues](https://github.com/hhyo/archery/issues)沟通反馈
 
+开发计划
+==============
+https://github.com/hhyo/archery/projects   
 
 快速开始
 ===============
@@ -62,8 +66,9 @@ http://127.0.0.1:9123/
 - [binlog2sql](https://github.com/danfengcao/binlog2sql)
 - [SQLAdvisor](https://github.com/Meituan-Dianping/SQLAdvisor)
 - [SOAR](https://github.com/XiaoMi/soar)
-- [SchemaSync](https://github.com/seanlook/SchemaSync)
+- [SchemaSync](https://github.com/hhyo/SchemaSync)
 - [aquila_v2](https://github.com/thinkdb/aquila_v2)
+- [django-q](https://github.com/Koed00/django-q)
 
 贡献者
 ===============

archery/settings.py

@@ -215,6 +215,10 @@
             'handlers': ['default'],
             'level': 'DEBUG',
         },
+        'django-q': {  # django_q模块相关日志
+            'handlers': ['console', 'default'],
+            'level': 'DEBUG',
+        },
         'django_auth_ldap': {  # django_auth_ldap模块相关日志
             'handlers': ['default'],
             'level': 'DEBUG',

src/docker/Dockerfile

@@ -23,8 +23,8 @@ RUN yum -y install wget gcc make zlib-devel openssl openssl-devel \
 #sqladvisor
 RUN yum -y install epel-release \
     && yum -y install cmake bison gcc-c++ git mysql-devel libaio-devel libffi-devel glib2 glib2-devel \
-    && yum -y install http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm \
-    && yum -y install Percona-Server-devel-56.x86_64  Percona-Server-shared-56.x86_64  Percona-Server-client-56.x86_64 \
+    && yum -y install https://repo.percona.com/yum/percona-release-latest.noarch.rpm \
+    && yum -y install Percona-Server-devel-56 Percona-Server-shared-56  Percona-Server-client-56 \
     && cd /opt \
     && git clone https://github.com/hhyo/SQLAdvisor.git \
     && cd /opt/SQLAdvisor/ \
@@ -39,21 +39,16 @@ RUN yum -y install epel-release \
 RUN cd /opt \
     && virtualenv venv4schemasync  --python=python2 \
     && source venv4schemasync/bin/activate \
-    && git clone https://github.com/hhyo/SchemaSync.git \
-    && git clone https://github.com/hhyo/SchemaObject.git \
-    && cd SchemaObject && python setup.py install \
-    && cd ../SchemaSync && python setup.py install \
-    && cd /opt && rm -rf /opt/SchemaObject/ && rm -rf /opt/SchemaSync/ \
     && yum install -y python-devel \
-    && pip install mysql-python
+    && pip install schema-sync mysql-python
 #soar
 RUN cd /opt \
-    && wget https://github.com/XiaoMi/soar/releases/download/0.10.0/soar.linux-amd64 -O soar \
+    && wget https://github.com/XiaoMi/soar/releases/download/0.11.0/soar.linux-amd64 -O soar \
     && chmod a+x soar
 #archery
 RUN cd /opt \
-    && yum -y install openldap-devel nginx \
-    && git clone https://github.com/hhyo/archery.git && cd archery && git checkout v1.3.8 \
+    && yum -y install openldap-devel unixODBC-devel nginx \
+    && git clone https://github.com/hhyo/archery.git && cd archery && git checkout v1.4.0 \
     && source /opt/venv4archery/bin/activate \
     && pip3 install -r /opt/archery/requirements.txt -i https://mirrors.ustc.edu.cn/pypi/web/simple/ \
     && cp /opt/archery/src/docker/nginx.conf /etc/nginx/ \

src/docker/startup.sh

@@ -19,7 +19,7 @@ fi
 python3 manage.py collectstatic -v0 --noinput
 
 #启动Django Q cluster
-nohup python3 manage.py qcluster &
+nohup python3 manage.py qcluster >> /opt/archery/downloads/log/qcluster.log 2>&1 &
 
 settings=${1:-"archery.settings"}
 ip=${2:-"127.0.0.1"}