webhook 接口调试完毕

Author: hustcc

.gitignore

@@ -1,8 +1,65 @@
-*.pyc
-.settings
-.project
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib64/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
 .pydevproject
+.project
+.settings
+
+node_modules/*
+celerybeat*
+
+config.py
 git_webhook.db
-nohup.out
-app/config.py
-node_modules

app/config_example.py

@@ -5,12 +5,13 @@
 @author: hustcc
 '''
 
+# for sqlite
+DATABASE_URI = 'sqlite:///git_webhook.db'
+# for mysql
+# DATABASE_URI = 'mysql://dev:[email protected]/git_webhook'
 
-DATABASE_URI = 'mysql://dev:[email protected]/git_webhook'
-
-
-CELERY_BROKER_URL = 'redis://localhost:6379/0'
-CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
+CELERY_BROKER_URL = 'redis://:[email protected]:6379/0'
+CELERY_RESULT_BACKEND = 'redis://:[email protected]:6379/0'
 
 
 GITHUB_CLIENT_ID = 'b6e751cc48d664240467'

app/database/model.py

@@ -79,7 +79,7 @@ class WebHook(db.Model, BaseMethod):
 
     key = db.Column(db.String(32), unique=True) # 用于webhook，保证私密，直接用 md5 salt
 
-    status = db.Column(db.String(1)) # 1: ing, 2:error, 3: success
+    status = db.Column(db.String(1)) # 1:waiting, 2:ing, 3:error, 4:success, 5:except, other
 
     def dict(self, with_key=False):
         rst = {}
@@ -95,12 +95,16 @@ def dict(self, with_key=False):
         rst['status'] = self.status
         return rst
 
+    def updateStatus(self, status):
+        self.status = status
+        self.save()
+    
 
 class History(db.Model, BaseMethod):
     '''push history'''
     #md5, notice, output, push_name, push_email, success, add_time
     id = db.Column(db.Integer, primary_key=True)
-    status = db.Column(db.String(1)) # 1: ing, 2: error, 3: success
+    status = db.Column(db.String(1)) # 1:waiting, 2:ing, 3:error, 4:success, 5:except, other
     shell_log = db.Column(db.Text) # hook shell log
 
     data = db.Column(db.Text) # git push data
@@ -121,3 +125,7 @@ def dict(self):
 
         rst['webhook_id'] = self.webhook_id
         return rst
+    
+    def updateStatus(self, status):
+        self.status = status
+        self.save()